[skywalking] branch master updated: fix 3296 (#3306)

[wusheng]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 3c8307f  fix 3296 (#3306)
3c8307f is described below

commit 3c8307fe1f04b88a49e53e08f58f6b35c67e0e85
Author: honganan <975990...@qq.com>
AuthorDate: Sat Aug 24 17:32:39 2019 +0800

    fix 3296 (#3306)
---
 .../mysql/v5/define/PreparedStatementInstrumentation.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementInstrumentation.java
 
b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementInstrumentation.java
index 50b34ea..bf2209f 100644
--- 
a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementInstrumentation.java
+++ 
b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementInstrumentation.java
@@ -19,15 +19,16 @@
 
 package org.apache.skywalking.apm.plugin.jdbc.mysql.v5.define;
 
-import net.bytebuddy.description.method.MethodDescription;
-import net.bytebuddy.matcher.ElementMatcher;
+import static net.bytebuddy.matcher.ElementMatchers.named;
+import static 
org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
+
 import 
org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint;
 import 
org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
 import org.apache.skywalking.apm.plugin.jdbc.mysql.Constants;
 
-import static net.bytebuddy.matcher.ElementMatchers.named;
-import static 
org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch.byMultiClassMatch;
+import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.matcher.ElementMatcher;
 
 /**
  * {@link PreparedStatementInstrumentation} define that the mysql-2.x plugin 
intercepts the following methods in the
@@ -45,7 +46,6 @@ public class PreparedStatementInstrumentation extends 
AbstractMysqlInstrumentati
 
     private static final String SERVICE_METHOD_INTERCEPTOR = 
Constants.PREPARED_STATEMENT_EXECUTE_METHODS_INTERCEPTOR;
     public static final String MYSQL_PREPARED_STATEMENT_CLASS_NAME = 
"com.mysql.jdbc.PreparedStatement";
-    public static final String JDBC42_PREPARED_STATEMENT_CLASS_NAME = 
"com.mysql.jdbc.JDBC42PreparedStatement";
 
     @Override public final ConstructorInterceptPoint[] 
getConstructorsInterceptPoints() {
         return new ConstructorInterceptPoint[0];
@@ -73,7 +73,7 @@ public class PreparedStatementInstrumentation extends 
AbstractMysqlInstrumentati
     }
 
     @Override protected ClassMatch enhanceClass() {
-        return 
byMultiClassMatch(MYSQL_PREPARED_STATEMENT_CLASS_NAME,JDBC42_PREPARED_STATEMENT_CLASS_NAME);
+        return byName(MYSQL_PREPARED_STATEMENT_CLASS_NAME);
     }
 
 }