[Agent] Support jdbc4, jdbc3 and jdbc42 of postgresql driver

apache · Jan 11, 2018 · 97b5778 · 97b5778
1 parent 3613691
commit 97b5778
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 3 deletions.
diff --git a/...va/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/ConnectionInstrumentation.java b/...va/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/ConnectionInstrumentation.java
@@ -29,7 +29,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType;
-import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;
+import static org.apache.skywalking.apm.plugin.jdbc.postgresql.define.MultiClassNameMatch.byMultiClassMatch;
 
 /**
  * {@link ConnectionInstrumentation} intercept the following methods that the class which extend {@link
@@ -49,8 +49,11 @@
 public class ConnectionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
 
     private static final String PREPARE_STATEMENT_METHOD_WITH_STRING_ARRAY_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.jdbc.postgresql.JDBCPrepareStatementWithStringArrayInterceptor";
-    public static final String ENHANCE_CLASS = "org.postgresql.jdbc.PgConnection";
+    public static final String PG_CONNECTION_ENHANCE_CLASS = "org.postgresql.jdbc.PgConnection";
     public static final String STRING_ARRAY_ARGUMENT_TYPE = "java.lang.String[]";
+    public static final String PG_JDBC42_CONNECTION_ENHANCE_CLASS = "org.postgresql.jdbc42.Jdbc42Connection";
+    public static final String PG_JDBC3_CONNECTION_ENHANCE_CLASS = "org.postgresql.jdbc3g.Jdbc3gConnection";
+    public static final String PG_JDBC4_CONNECTION_ENHANCE_CLASS = "org.postgresql.jdbc4.Jdbc4Connection";
 
     @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
         return new ConstructorInterceptPoint[0];
@@ -127,6 +130,6 @@ public class ConnectionInstrumentation extends ClassInstanceMethodsEnhancePlugin
     }
 
     @Override protected ClassMatch enhanceClass() {
-        return byName(ENHANCE_CLASS);
+        return byMultiClassMatch(PG_CONNECTION_ENHANCE_CLASS, PG_JDBC42_CONNECTION_ENHANCE_CLASS, PG_JDBC3_CONNECTION_ENHANCE_CLASS, PG_JDBC4_CONNECTION_ENHANCE_CLASS);
     }
 }
diff --git a/...ain/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/MultiClassNameMatch.java b/...ain/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/MultiClassNameMatch.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+package org.apache.skywalking.apm.plugin.jdbc.postgresql.define;
+
+import java.util.Arrays;
+import java.util.List;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
+import org.apache.skywalking.apm.agent.core.plugin.match.IndirectMatch;
+
+import static net.bytebuddy.matcher.ElementMatchers.named;
+
+/**
+ * Match class with a given set of classes.
+ *
+ * @author zhangxin
+ */
+public class MultiClassNameMatch implements IndirectMatch {
+
+    private List<String> matchClassNames;
+
+    private MultiClassNameMatch(String[] classNames) {
+        if (classNames == null || classNames.length == 0) {
+            throw new IllegalArgumentException("match class names is null");
+        }
+        this.matchClassNames = Arrays.asList(classNames);
+    }
+
+    @Override
+    public ElementMatcher.Junction buildJunction() {
+        ElementMatcher.Junction junction = null;
+        for (String name : matchClassNames) {
+            if (junction == null) {
+                junction = named(name);
+            } else {
+                junction = junction.or(named(name));
+            }
+        }
+        return junction;
+    }
+
+    @Override
+    public boolean isMatch(TypeDescription typeDescription) {
+        return matchClassNames.contains(typeDescription.getTypeName());
+    }
+
+    public static ClassMatch byMultiClassMatch(String... classNames) {
+        return new MultiClassNameMatch(classNames);
+    }
+}