From 921ed6f557662b30342eca14bd6711b49800888b Mon Sep 17 00:00:00 2001 From: HyunGil Jeong Date: Mon, 12 Sep 2016 17:01:10 +0900 Subject: [PATCH] Adds enable/disable configurations for mariadb and cassandra plugins (#2090) * Add configuration for enabling mariadb and cassandra plugins * Increase mariadb test coverage to include version 1.5+ --- agent/src/main/resources-local/pinpoint.config | 2 ++ agent/src/main/resources-release/pinpoint.config | 2 ++ .../pinpoint-real-env-lowoverhead-sample.config | 10 ++++++++++ .../pinpoint/plugin/jdbc/mariadb/MariaDB_1_4_x_IT.java | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/agent/src/main/resources-local/pinpoint.config b/agent/src/main/resources-local/pinpoint.config index 2955e052c1ba..db993c674a33 100644 --- a/agent/src/main/resources-local/pinpoint.config +++ b/agent/src/main/resources-local/pinpoint.config @@ -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. diff --git a/agent/src/main/resources-release/pinpoint.config b/agent/src/main/resources-release/pinpoint.config index 093e41d2675a..83d692f1a782 100644 --- a/agent/src/main/resources-release/pinpoint.config +++ b/agent/src/main/resources-release/pinpoint.config @@ -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. diff --git a/agent/src/main/resources/pinpoint-real-env-lowoverhead-sample.config b/agent/src/main/resources/pinpoint-real-env-lowoverhead-sample.config index 9e5f508d17dc..920c2eb57674 100644 --- a/agent/src/main/resources/pinpoint-real-env-lowoverhead-sample.config +++ b/agent/src/main/resources/pinpoint-real-env-lowoverhead-sample.config @@ -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. @@ -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 # diff --git a/agent/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mariadb/MariaDB_1_4_x_IT.java b/agent/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mariadb/MariaDB_1_4_x_IT.java index 44f96058386b..95d44d936392 100644 --- a/agent/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mariadb/MariaDB_1_4_x_IT.java +++ b/agent/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mariadb/MariaDB_1_4_x_IT.java @@ -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