Skip to content

Commit

Permalink
Adds enable/disable configurations for mariadb and cassandra plugins (#…
Browse files Browse the repository at this point in the history
…2090)

* Add configuration for enabling mariadb and cassandra plugins
* Increase mariadb test coverage to include version 1.5+
  • Loading branch information
Xylus authored Sep 12, 2016
1 parent e158e14 commit 921ed6f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 1 deletion.
2 changes: 2 additions & 0 deletions agent/src/main/resources-local/pinpoint.config
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ profiler.jdbc.mysql.rollback=true
#
# MARIADB
#
# Profile MariaDB
profiler.jdbc.mariadb=true
# Allow profiling of setautocommit.
profiler.jdbc.mariadb.setautocommit=true
# Allow profiling of commit.
Expand Down
2 changes: 2 additions & 0 deletions agent/src/main/resources-release/pinpoint.config
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ profiler.jdbc.mysql.rollback=true
#
# MARIADB
#
# Profile MariaDB
profiler.jdbc.mariadb=true
# Allow profiling of setautocommit.
profiler.jdbc.mariadb.setautocommit=true
# Allow profiling of commit.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ profiler.jdbc.mysql.rollback=false
#
# MARIADB
#
# Profile MariaDB
profiler.jdbc.mariadb=true
# Allow profiling of setautocommit.
profiler.jdbc.mariadb.setautocommit=false
# Allow profiling of commit.
Expand Down Expand Up @@ -192,6 +194,14 @@ profiler.jdbc.cubrid.rollback=false
profiler.jdbc.dbcp=true
profiler.jdbc.dbcp.connectionclose=false

#
# CASSANDRA
#
# Profile CASSANDRA.
profiler.cassandra=true
# Trace bindvalues for CASSANDRA PreparedStatements (overrides profiler.jdbc.tracesqlbindvalue)
#profiler.cassandra.tracecqlbindvalue=true

#
# PostgreSQL
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

@RunWith(PinpointPluginTestSuite.class)
@JvmVersion(7)
@Dependency({ "org.mariadb.jdbc:mariadb-java-client:[1.4.min,1.4.max]", "ch.vorburger.mariaDB4j:mariaDB4j:2.2.2" })
@Dependency({ "org.mariadb.jdbc:mariadb-java-client:[1.4.min,)", "ch.vorburger.mariaDB4j:mariaDB4j:2.2.2" })
public class MariaDB_1_4_x_IT extends MariaDB_IT_Base {

// see CallableParameterMetaData#queryMetaInfos
Expand Down

0 comments on commit 921ed6f

Please # to comment.