Align classLoaderMatcher signature with OpenTelemetry (#7125)

* Align classLoaderMatcher signature with OpenTelemetry to avoid need for bridge method
* Improve mapping of AgentElementMatchers
* Fix resource leak in RequestImplementationClassLoaderMatcher

Author: mcculls

dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelElementMatchers.java

@@ -0,0 +1,43 @@
+package datadog.opentelemetry.tooling;
+
+import datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers;
+import datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers;
+import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+import net.bytebuddy.matcher.ElementMatchers;
+
+/** Replaces OpenTelemetry's {@code AgentElementMatchers} when mapping extensions. */
+public final class OtelElementMatchers {
+
+  public static ElementMatcher.Junction<TypeDescription> extendsClass(
+      ElementMatcher<TypeDescription> matcher) {
+    return HierarchyMatchers.extendsClass(matcher);
+  }
+
+  public static ElementMatcher.Junction<TypeDescription> implementsInterface(
+      ElementMatcher<TypeDescription> matcher) {
+    return HierarchyMatchers.implementsInterface(matcher);
+  }
+
+  public static ElementMatcher.Junction<TypeDescription> hasSuperType(
+      ElementMatcher<TypeDescription> matcher) {
+    return HierarchyMatchers.hasSuperType(matcher);
+  }
+
+  public static ElementMatcher.Junction<MethodDescription> methodIsDeclaredByType(
+      ElementMatcher<? super TypeDescription> matcher) {
+    return ElementMatchers.isDeclaredBy(matcher);
+  }
+
+  public static ElementMatcher.Junction<MethodDescription> hasSuperMethod(
+      ElementMatcher<? super MethodDescription> matcher) {
+    return HierarchyMatchers.hasSuperMethod(matcher);
+  }
+
+  public static ElementMatcher.Junction<ClassLoader> hasClassesNamed(String... classNames) {
+    return ClassLoaderMatchers.hasClassNamedOneOf(classNames);
+  }
+
+  private OtelElementMatchers() {}
+}

dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumentationMapper.java

@@ -45,11 +45,10 @@ public void visit(
   @Override
   public MethodVisitor visitMethod(
       int access, String name, String descriptor, String signature, String[] exceptions) {
-    if (!UNSUPPORTED_METHODS.contains(name)) {
-      return super.visitMethod(access, name, descriptor, signature, exceptions);
-    } else {
+    if (UNSUPPORTED_METHODS.contains(name)) {
       return null; // remove unsupported method
     }
+    return super.visitMethod(access, name, descriptor, signature, exceptions);
   }
 
   private String[] removeUnsupportedTypes(String[] interfaces) {
@@ -84,12 +83,12 @@ static final class Renamer extends Remapper {
       RENAMED_TYPES.put(
           "io/opentelemetry/javaagent/extension/instrumentation/TypeTransformer",
           "datadog/opentelemetry/tooling/OtelTransformer");
+      RENAMED_TYPES.put(
+          "io/opentelemetry/javaagent/extension/matcher/AgentElementMatchers",
+          "datadog/opentelemetry/tooling/OtelElementMatchers");
       RENAMED_TYPES.put(
           "io/opentelemetry/javaagent/bootstrap/Java8BytecodeBridge",
           "datadog/trace/bootstrap/otel/Java8BytecodeBridge");
-      RENAMED_TYPES.put(
-          "io/opentelemetry/javaagent/extension/matcher/AgentElementMatchers",
-          "datadog/trace/agent/tooling/bytebuddy/matcher/HierarchyMatchers");
     }
 
     @Override

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java

@@ -142,7 +142,7 @@ public String muzzleDirective() {
   }
 
   /** Override this to supply additional class-loader requirements. */
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     return ANY_CLASS_LOADER;
   }
 

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ClassLoaderMatchers.java

@@ -22,7 +22,7 @@
 public final class ClassLoaderMatchers {
   private static final Logger log = LoggerFactory.getLogger(ClassLoaderMatchers.class);
 
-  public static final ElementMatcher<ClassLoader> ANY_CLASS_LOADER = any();
+  public static final ElementMatcher.Junction<ClassLoader> ANY_CLASS_LOADER = any();
 
   private static final ClassLoader BOOTSTRAP_CLASSLOADER = null;
 

dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java

@@ -24,7 +24,7 @@ public String instrumentedType() {
   }
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     return hasClassNamed("com.linecorp.armeria.server.ServiceRequestContext");
   }
 

dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/InvokerInstrumentation.java

@@ -24,7 +24,7 @@ public InvokerInstrumentation() {
   }
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     return ClassLoaderMatchers.hasClassNamed("javax.servlet.ServletRequest")
         .or(ClassLoaderMatchers.hasClassNamed("jakarta.servlet.ServletRequest"));
   }

dd-java-agent/instrumentation/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java

@@ -36,7 +36,7 @@ public Map<String, String> contextStore() {
   }
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     return hasClassNamed("com.datastax.driver.core.EndPoint");
   }
 

dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java

@@ -37,7 +37,7 @@ public Map<String, String> contextStore() {
   }
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     return not(hasClassNamed("com.datastax.driver.core.EndPoint"));
   }
 

dd-java-agent/instrumentation/elasticsearch/rest-7/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java

@@ -31,7 +31,7 @@ public Elasticsearch7RestClientInstrumentation() {
   }
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // Avoid matching pre-ES7 releases which have their own instrumentations.
     return hasClassNamed("org.elasticsearch.client.RestClient$InternalRequest");
   }

dd-java-agent/instrumentation/elasticsearch/transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java

@@ -32,7 +32,7 @@ public Elasticsearch73TransportClientInstrumentation() {
   }
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // Avoid matching pre-ES7 releases which have their own instrumentations.
     return hasClassNamed("org.elasticsearch.action.ActionType");
   }