From dc379fd351f4d67501db52acf74188cf292e87a7 Mon Sep 17 00:00:00 2001 From: "Xin,Zhang" Date: Tue, 6 Nov 2018 07:53:47 +0800 Subject: [PATCH] Fix issue that H2 plugin is ineffective (#1878) --- .../apm/plugin/jdbc/h2/define/DriverInstrumentation.java | 2 +- .../plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java | 2 +- .../plugin/jdbc/h2/define/JdbcXAConnectionInstrumentation.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/DriverInstrumentation.java b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/DriverInstrumentation.java index 1fd69d653..3d4fafd3c 100644 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/DriverInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/DriverInstrumentation.java @@ -30,7 +30,7 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName * @author zhangxin */ public class DriverInstrumentation extends AbstractDriverInstrumentation { - private static final String CLASS_OF_INTERCEPT_H2_DRIVER = "org.jdbc.Driver"; + private static final String CLASS_OF_INTERCEPT_H2_DRIVER = "org.h2.Driver"; @Override protected ClassMatch enhanceClass() { diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java index 7ee6970d2..0b778b266 100644 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java @@ -29,7 +29,7 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName * @author zhangxin */ public class JdbcConnectionInstrumentation extends AbstractConnectionInstrumentation { - public static final String ENHANCE_CLASS = "org.jdbc.jdbc.JdbcConnection"; + public static final String ENHANCE_CLASS = "org.h2.jdbc.JdbcConnection"; @Override protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcXAConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcXAConnectionInstrumentation.java index 6e6945c42..3b1444c8f 100644 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcXAConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcXAConnectionInstrumentation.java @@ -34,7 +34,7 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName */ public class JdbcXAConnectionInstrumentation extends AbstractConnectionInstrumentation { - public static final String ENHANCE_CLASS = "org.jdbc.jdbcx.JdbcXAConnection"; + public static final String ENHANCE_CLASS = "org.h2.jdbcx.JdbcXAConnection"; public static final String CONSTRUCTOR_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.jdbc.JdbcXAConnectionConstructorInterceptor"; @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {