Rename TypeInstrumentation#classLoaderMatcher() to classLoaderOptimization() (#1741)

* Rename TypeInstrumentation#classLoaderMatcher() to classLoaderOptimization()

* Removed no longer needed comments & improved JavaDoc

* Improve TypeInstrumentation Javadoc

instrumentation/akka-actor-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinTaskInstrumentation.java

@@ -38,8 +38,7 @@ final class AkkaForkJoinTaskInstrumentation implements TypeInstrumentation {
   static final String TASK_CLASS_NAME = "akka.dispatch.forkjoin.ForkJoinTask";
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed(TASK_CLASS_NAME);
   }
 

instrumentation/apache-camel-2.20/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java

@@ -67,8 +67,7 @@ public class ApacheCamelInstrumentationModule extends InstrumentationModule {
 
   private static final class CamelContextInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("org.apache.camel.CamelContext");
     }
 

instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java

@@ -41,8 +41,7 @@ import org.apache.http.protocol.HttpCoreContext;
 final class ApacheHttpAsyncClientInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.apache.http.nio.client.HttpAsyncClient");
   }
 

instrumentation/apache-httpasyncclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java

@@ -30,8 +30,7 @@ import org.apache.http.HttpRequest;
 public class ApacheHttpClientRedirectInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.apache.http.client.RedirectStrategy");
   }
 

instrumentation/apache-httpclient/apache-httpclient-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientInstrumentationModule.java

@@ -50,8 +50,7 @@ public class ApacheHttpClientInstrumentationModule extends InstrumentationModule
 
   private static final class HttpClientInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("org.apache.commons.httpclient.HttpClient");
     }
 

instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumentationModule.java

@@ -59,8 +59,7 @@ public class ApacheHttpClientInstrumentationModule extends InstrumentationModule
 
   private static final class HttpClientInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("org.apache.http.client.HttpClient");
     }
 

instrumentation/async-http-client-1.9/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/ResponseInstrumentation.java

@@ -21,7 +21,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class ResponseInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("com.ning.http.client.AsyncCompletionHandler");
   }
 

instrumentation/aws-lambda-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambda/v1_0/AwsLambdaRequestHandlerInstrumentation.java

@@ -33,7 +33,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class AwsLambdaRequestHandlerInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("com.amazonaws.services.lambda.runtime.RequestHandler");
   }
 

instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/RequestInstrumentation.java

@@ -25,8 +25,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class RequestInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("com.amazonaws.AmazonWebServiceRequest");
   }
 

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsHttpClientInstrumentation.java

@@ -31,8 +31,7 @@ import software.amazon.awssdk.core.internal.http.pipeline.stages.MakeAsyncHttpRe
 final class AwsHttpClientInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed(
         "software.amazon.awssdk.core.internal.http.pipeline.stages.MakeHttpRequestStage");
   }

instrumentation/couchbase/couchbase-2.6/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseNetworkInstrumentation.java

@@ -30,8 +30,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class CouchbaseNetworkInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("com.couchbase.client.core.endpoint.AbstractGenericHandler");
   }
 

instrumentation/dropwizard-views-0.7/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardViewsInstrumentationModule.java

@@ -47,8 +47,7 @@ public final class DropwizardViewsInstrumentationModule extends InstrumentationM
 
   private static final class ViewRendererInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("io.dropwizard.views.ViewRenderer");
     }
 

instrumentation/external-annotations/src/main/java/io/opentelemetry/javaagent/instrumentation/traceannotation/TraceAnnotationsInstrumentationModule.java

@@ -84,6 +84,7 @@ public final class TraceAnnotationsInstrumentationModule extends Instrumentation
 
   private static final class AnnotatedMethodsInstrumentation implements TypeInstrumentation {
     private final Set<String> additionalTraceAnnotations;
+    private final ElementMatcher.Junction<ClassLoader> classLoaderOptimization;
     private final ElementMatcher.Junction<NamedElement> traceAnnotationMatcher;
     /** This matcher matches all methods that should be excluded from transformation. */
     private final ElementMatcher.Junction<MethodDescription> excludedMethodsMatcher;
@@ -92,16 +93,21 @@ public final class TraceAnnotationsInstrumentationModule extends Instrumentation
       additionalTraceAnnotations = configureAdditionalTraceAnnotations();
 
       if (additionalTraceAnnotations.isEmpty()) {
+        classLoaderOptimization = none();
         traceAnnotationMatcher = none();
       } else {
+        ElementMatcher.Junction<ClassLoader> classLoaderMatcher = null;
         ElementMatcher.Junction<NamedElement> methodTraceMatcher = null;
         for (String annotationName : additionalTraceAnnotations) {
           if (methodTraceMatcher == null) {
+            classLoaderMatcher = hasClassesNamed(annotationName);
             methodTraceMatcher = named(annotationName);
           } else {
+            classLoaderMatcher = classLoaderMatcher.or(hasClassesNamed(annotationName));
             methodTraceMatcher = methodTraceMatcher.or(named(annotationName));
           }
         }
+        this.classLoaderOptimization = classLoaderMatcher;
         this.traceAnnotationMatcher = methodTraceMatcher;
       }
 
@@ -109,20 +115,8 @@ public final class TraceAnnotationsInstrumentationModule extends Instrumentation
     }
 
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
-      ElementMatcher.Junction<ClassLoader> matcher = null;
-      for (String name : additionalTraceAnnotations) {
-        if (matcher == null) {
-          matcher = hasClassesNamed(name);
-        } else {
-          matcher = matcher.or(hasClassesNamed(name));
-        }
-      }
-      if (matcher == null) {
-        return none();
-      }
-      return matcher;
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
+      return classLoaderOptimization;
     }
 
     @Override

instrumentation/external-annotations/src/main/java/io/opentelemetry/javaagent/instrumentation/traceannotation/TraceConfigInstrumentationModule.java

@@ -86,8 +86,7 @@ public class TraceConfigInstrumentationModule extends InstrumentationModule {
     }
 
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed(className);
     }
 

instrumentation/finatra-2.9/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/FinatraInstrumentationModule.java

@@ -54,8 +54,7 @@ public class FinatraInstrumentationModule extends InstrumentationModule {
 
   private static final class RouteInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("com.twitter.finatra.http.internal.routing.Route");
     }
 

instrumentation/geode-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumentationModule.java

@@ -50,8 +50,7 @@ public class GeodeInstrumentationModule extends InstrumentationModule {
 
   private static final class RegionInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // optimization for expensive typeMatcher
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("org.apache.geode.cache.Region");
     }
 

instrumentation/grizzly-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/FilterInstrumentation.java

@@ -23,7 +23,7 @@ import net.bytebuddy.matcher.ElementMatchers;
 final class FilterInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.glassfish.grizzly.filterchain.BaseFilter");
   }
 

instrumentation/grpc-1.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grpc/v1_5/GrpcClientBuilderBuildInstrumentation.java

@@ -24,8 +24,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 
 final class GrpcClientBuilderBuildInstrumentation implements TypeInstrumentation {
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // optimization for expensive typeMatcher
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("io.grpc.ManagedChannelBuilder");
   }
 

instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/CriteriaInstrumentation.java

@@ -29,8 +29,7 @@ import org.hibernate.Criteria;
 final class CriteriaInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.hibernate.Criteria");
   }
 

instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/QueryInstrumentation.java

@@ -28,8 +28,7 @@ import org.hibernate.Query;
 final class QueryInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.hibernate.Query");
   }
 

instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionFactoryInstrumentation.java

@@ -34,8 +34,7 @@ import org.hibernate.StatelessSession;
 final class SessionFactoryInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.hibernate.SessionFactory");
   }
 

instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/SessionInstrumentation.java

@@ -41,8 +41,7 @@ import org.hibernate.Transaction;
 final class SessionInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.hibernate.Session", "org.hibernate.StatelessSession");
   }
 

instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/TransactionInstrumentation.java

@@ -28,8 +28,7 @@ import org.hibernate.Transaction;
 final class TransactionInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.hibernate.Transaction");
   }
 

instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaInstrumentation.java

@@ -29,8 +29,7 @@ import org.hibernate.Criteria;
 final class CriteriaInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.hibernate.Criteria");
   }
 

instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/QueryInstrumentation.java

@@ -28,8 +28,7 @@ import org.hibernate.Query;
 final class QueryInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.hibernate.Query");
   }
 

instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionFactoryInstrumentation.java

@@ -32,8 +32,7 @@ import org.hibernate.SharedSessionContract;
 final class SessionFactoryInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.hibernate.SessionFactory");
   }
 

instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionInstrumentation.java

@@ -40,8 +40,7 @@ import org.hibernate.Transaction;
 final class SessionInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.hibernate.SharedSessionContract");
   }
 

instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/TransactionInstrumentation.java

@@ -28,8 +28,7 @@ import org.hibernate.Transaction;
 final class TransactionInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.hibernate.Transaction");
   }
 

instrumentation/hibernate/hibernate-4.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/ProcedureCallInstrumentation.java

@@ -27,8 +27,7 @@ import org.hibernate.procedure.ProcedureCall;
 final class ProcedureCallInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.hibernate.procedure.ProcedureCall");
   }
 

instrumentation/hibernate/hibernate-4.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_3/SessionInstrumentation.java

@@ -29,8 +29,7 @@ import org.hibernate.procedure.ProcedureCall;
 final class SessionInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.hibernate.SharedSessionContract");
   }
 

instrumentation/hystrix-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixInstrumentationModule.java

@@ -57,8 +57,7 @@ public class HystrixInstrumentationModule extends InstrumentationModule {
 
   private static final class HystrixCommandInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed(
           "com.netflix.hystrix.HystrixCommand", "com.netflix.hystrix.HystrixObservableCommand");
     }

instrumentation/java-httpclient/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/HttpClientInstrumentation.java

@@ -33,8 +33,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class HttpClientInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("java.net.http.HttpClient");
   }
 

instrumentation/jaxrs-client/jaxrs-client-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientInstrumentationModule.java

@@ -52,8 +52,7 @@ public final class JaxRsClientInstrumentationModule extends InstrumentationModul
 
   private static final class ClientHandlerInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("com.sun.jersey.api.client.ClientHandler");
     }
 

instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientInstrumentationModule.java

@@ -49,8 +49,7 @@ public final class JaxRsClientInstrumentationModule extends InstrumentationModul
 
   private static final class ClientBuilderInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("javax.ws.rs.client.ClientBuilder");
     }
 

instrumentation/jaxrs/jaxrs-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxRsAnnotationsInstrumentation.java

@@ -31,8 +31,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class JaxRsAnnotationsInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.ws.rs.Path");
   }
 

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/AbstractRequestContextInstrumentation.java

@@ -21,8 +21,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 
 public abstract class AbstractRequestContextInstrumentation implements TypeInstrumentation {
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.ws.rs.container.ContainerRequestContext");
   }
 

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/ContainerRequestFilterInstrumentation.java

@@ -29,8 +29,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 class ContainerRequestFilterInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.ws.rs.container.ContainerRequestFilter");
   }
 

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRsAnnotationsInstrumentation.java

@@ -35,8 +35,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 
 final class JaxRsAnnotationsInstrumentation implements TypeInstrumentation {
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.ws.rs.Path");
   }
 

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRsAsyncResponseInstrumentation.java

@@ -27,8 +27,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class JaxRsAsyncResponseInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.ws.rs.container.AsyncResponse");
   }
 

instrumentation/jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/ConnectionInstrumentation.java

@@ -26,7 +26,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class ConnectionInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("java.sql.Connection");
   }
 

instrumentation/jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/DriverInstrumentation.java

@@ -25,7 +25,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class DriverInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("java.sql.Driver");
   }
 

instrumentation/jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/PreparedStatementInstrumentation.java

@@ -28,7 +28,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class PreparedStatementInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("java.sql.PreparedStatement");
   }
 

instrumentation/jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/StatementInstrumentation.java

@@ -28,7 +28,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class StatementInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("java.sql.Statement");
   }
 

instrumentation/jetty-8.0/src/main/java/io/opentelemetry/javaagent/instrumentation/jetty/JettyInstrumentationModule.java

@@ -50,8 +50,7 @@ public final class JettyInstrumentationModule extends InstrumentationModule {
 
   private static final class HandlerInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("org.eclipse.jetty.server.Handler");
     }
 

instrumentation/jms-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageConsumerInstrumentation.java

@@ -27,8 +27,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class JmsMessageConsumerInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.jms.MessageConsumer");
   }
 

instrumentation/jms-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageListenerInstrumentation.java

@@ -26,8 +26,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class JmsMessageListenerInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.jms.MessageListener");
   }
 

instrumentation/jms-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageProducerInstrumentation.java

@@ -30,8 +30,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class JmsMessageProducerInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.jms.MessageProducer");
   }
 

instrumentation/jms-1.1/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsSessionInstrumentation.java

@@ -25,8 +25,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class JmsSessionInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.jms.Session");
   }
 

instrumentation/jsp-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/HttpJspPageInstrumentation.java

@@ -27,8 +27,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class HttpJspPageInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.servlet.jsp.HttpJspPage");
   }
 

instrumentation/khttp-0.1/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpInstrumentationModule.java

@@ -48,7 +48,7 @@ public class KHttpInstrumentationModule extends InstrumentationModule {
 
   private static final class KHttpInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("khttp.KHttp");
     }
 

instrumentation/kubernetes-client-7.0/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientInstrumentationModule.java

@@ -51,8 +51,7 @@ public class KubernetesClientInstrumentationModule extends InstrumentationModule
 
   private static final class ApiClientInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("io.kubernetes.client.openapi.ApiClient");
     }
 

instrumentation/netty/netty-3.8/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/ChannelFutureListenerInstrumentation.java

@@ -31,8 +31,7 @@ import org.jboss.netty.channel.ChannelFuture;
 final class ChannelFutureListenerInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.jboss.netty.channel.ChannelFutureListener");
   }
 

instrumentation/netty/netty-3.8/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyChannelInstrumentation.java

@@ -28,8 +28,7 @@ import org.jboss.netty.channel.Channel;
 final class NettyChannelInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.jboss.netty.channel.Channel");
   }
 

instrumentation/netty/netty-3.8/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyChannelPipelineInstrumentation.java

@@ -41,8 +41,7 @@ import org.jboss.netty.handler.codec.http.HttpServerCodec;
 final class NettyChannelPipelineInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.jboss.netty.channel.ChannelPipeline");
   }
 

instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/ChannelFutureListenerInstrumentation.java

@@ -28,8 +28,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class ChannelFutureListenerInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("io.netty.channel.ChannelFutureListener");
   }
 

instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyChannelPipelineInstrumentation.java

@@ -42,8 +42,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class NettyChannelPipelineInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("io.netty.channel.ChannelPipeline");
   }
 

instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/ChannelFutureListenerInstrumentation.java

@@ -28,8 +28,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class ChannelFutureListenerInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("io.netty.channel.ChannelFutureListener");
   }
 

instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyChannelPipelineInstrumentation.java

@@ -42,8 +42,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class NettyChannelPipelineInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("io.netty.channel.ChannelPipeline");
   }
 

instrumentation/oshi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiInstrumentationModule.java

@@ -52,7 +52,7 @@ public class OshiInstrumentationModule extends InstrumentationModule {
 
   private static final class SystemInfoInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("oshi.SystemInfo");
     }
 

instrumentation/play-ws/play-ws-common/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/AsyncHttpClientInstrumentation.java

@@ -29,8 +29,7 @@ public class AsyncHttpClientInstrumentation implements TypeInstrumentation {
   }
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("play.shaded.ahc.org.asynchttpclient.AsyncHttpClient");
   }
 

instrumentation/play/play-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_3/PlayInstrumentationModule.java

@@ -41,8 +41,7 @@ public final class PlayInstrumentationModule extends InstrumentationModule {
 
   private static final class ActionInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("play.api.mvc.Action");
     }
 

instrumentation/play/play-2.4/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/PlayInstrumentationModule.java

@@ -41,8 +41,7 @@ public final class PlayInstrumentationModule extends InstrumentationModule {
 
   private static final class ActionInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("play.api.mvc.Action");
     }
 

instrumentation/play/play-2.6/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayInstrumentationModule.java

@@ -41,8 +41,7 @@ public final class PlayInstrumentationModule extends InstrumentationModule {
 
   private static final class ActionInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("play.api.mvc.Action");
     }
 

instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelInstrumentation.java

@@ -45,8 +45,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class RabbitChannelInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("com.rabbitmq.client.Channel");
   }
 

instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitCommandInstrumentation.java

@@ -25,8 +25,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class RabbitCommandInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("com.rabbitmq.client.Command");
   }
 

instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/ContinuationInstrumentation.java

@@ -23,8 +23,7 @@ import ratpack.func.Block;
 final class ContinuationInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("ratpack.exec.internal.Continuation");
   }
 

instrumentation/ratpack-1.4/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java

@@ -22,8 +22,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class ServerErrorHandlerInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("ratpack.error.ServerErrorHandler");
   }
 

instrumentation/rediscala-1.8/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaInstrumentationModule.java

@@ -56,7 +56,7 @@ public final class RediscalaInstrumentationModule extends InstrumentationModule
 
   private static final class RequestInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("redis.Request");
     }
 

instrumentation/scala-executors/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaForkJoinTaskInstrumentation.java

@@ -39,8 +39,7 @@ final class ScalaForkJoinTaskInstrumentation implements TypeInstrumentation {
   static final String TASK_CLASS_NAME = "scala.concurrent.forkjoin.ForkJoinTask";
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed(TASK_CLASS_NAME);
   }
 

instrumentation/servlet/servlet-2.2/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/HttpServletResponseInstrumentation.java

@@ -37,7 +37,7 @@ import net.bytebuddy.matcher.ElementMatcher;
  */
 final class HttpServletResponseInstrumentation implements TypeInstrumentation {
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.servlet.http.HttpServletResponse");
   }
 

instrumentation/servlet/servlet-2.2/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/ServletAndFilterInstrumentation.java

@@ -22,8 +22,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class ServletAndFilterInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.servlet.http.HttpServlet");
   }
 

instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/AsyncContextInstrumentation.java

@@ -29,8 +29,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class AsyncContextInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.servlet.AsyncContext");
   }
 

instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/ServletAndFilterInstrumentation.java

@@ -21,8 +21,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 
 final class ServletAndFilterInstrumentation implements TypeInstrumentation {
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("javax.servlet.Filter");
   }
 

instrumentation/servlet/servlet-common/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentationModule.java

@@ -60,8 +60,7 @@ public final class RequestDispatcherInstrumentationModule extends Instrumentatio
 
   private static final class RequestDispatcherInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("javax.servlet.RequestDispatcher");
     }
 

instrumentation/servlet/servlet-common/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/http/HttpServletResponseInstrumentationModule.java

@@ -50,8 +50,7 @@ public final class HttpServletResponseInstrumentationModule extends Instrumentat
 
   private static final class HttpServletResponseInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("javax.servlet.http.HttpServletResponse");
     }
 

instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/client/WebfluxClientInstrumentationModule.java

@@ -47,8 +47,7 @@ public class WebfluxClientInstrumentationModule extends InstrumentationModule {
 
   private static final class WebClientBuilderInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
-      // Optimization for expensive typeMatcher.
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("org.springframework.web.reactive.function.client.WebClient");
     }
 

instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/HandlerAdapterInstrumentation.java

@@ -25,8 +25,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class HandlerAdapterInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.springframework.web.reactive.HandlerAdapter");
   }
 

instrumentation/spring/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/server/RouterFunctionInstrumentation.java

@@ -25,8 +25,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class RouterFunctionInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.springframework.web.reactive.function.server.ServerRequest");
   }
 

instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/HandlerAdapterInstrumentation.java

@@ -32,8 +32,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class HandlerAdapterInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("org.springframework.web.servlet.HandlerAdapter");
   }
 

instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/WebApplicationContextInstrumentation.java

@@ -29,8 +29,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 final class WebApplicationContextInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed(
         "org.springframework.context.support.AbstractApplicationContext",
         "org.springframework.web.context.WebApplicationContext");

instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/ActionInvocationInstrumentation.java

@@ -21,7 +21,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 public class ActionInvocationInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("com.opensymphony.xwork2.ActionInvocation");
   }
 

instrumentation/twilio-6.6/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioAsyncInstrumentation.java

@@ -36,8 +36,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class TwilioAsyncInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("com.twilio.Twilio");
   }
 

instrumentation/twilio-6.6/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioSyncInstrumentation.java

@@ -31,8 +31,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 final class TwilioSyncInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    // Optimization for expensive typeMatcher.
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
     return hasClassesNamed("com.twilio.Twilio");
   }
 

instrumentation/vertx-reactive-3.5/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.java

@@ -48,7 +48,7 @@ public class VertxRxInstrumentationModule extends InstrumentationModule {
 
   private static final class AsyncResultSingleInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       // Different versions of Vert.x has this class in different packages
       return hasClassesNamed("io.vertx.reactivex.core.impl.AsyncResultSingle")
           .or(hasClassesNamed("io.vertx.reactivex.impl.AsyncResultSingle"));

instrumentation/vertx-web-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java

@@ -48,7 +48,7 @@ public final class VertxWebInstrumentationModule extends InstrumentationModule {
 
   private static final class RouteInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<ClassLoader> classLoaderMatcher() {
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
       return hasClassesNamed("io.vertx.ext.web.Route");
     }
 

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/InstrumentationModule.java

@@ -141,7 +141,7 @@ public abstract class InstrumentationModule {
                       typeInstrumentation.typeMatcher(),
                       "Instrumentation type matcher unexpected exception: " + getClass().getName()),
                   failSafe(
-                      moduleClassLoaderMatcher.and(typeInstrumentation.classLoaderMatcher()),
+                      moduleClassLoaderMatcher.and(typeInstrumentation.classLoaderOptimization()),
                       "Instrumentation class loader matcher unexpected exception: "
                           + getClass().getName()))
               .and(NOT_DECORATOR_MATCHER)

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/TypeInstrumentation.java

@@ -12,20 +12,36 @@ import java.util.Map;
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
+import net.bytebuddy.matcher.ElementMatchers;
 
 /**
  * Interface representing a single type instrumentation. Part of an {@link InstrumentationModule}.
  */
 public interface TypeInstrumentation {
   /**
-   * A type instrumentation can implement this method to optimize an expensive {@link
-   * #typeMatcher()} - usually {@link AgentElementMatchers#implementsInterface(ElementMatcher)} or
-   * {@link AgentElementMatchers#extendsClass(ElementMatcher)}. In that case it's useful to check
-   * that the classloader contains the class/interface that is being extended.
+   * An optimization to short circuit matching in the case where the instrumented library is not
+   * even present on the class path.
    *
-   * @return A type matcher used to match the classloader under transform
+   * <p>Most applications have only a small subset of libraries on their class path, so this ends up
+   * being a very useful optimization.
+   *
+   * <p>Some background on type matcher performance:
+   *
+   * <p>Type matchers that only match against the type name are fast, e.g. {@link
+   * ElementMatchers#named(String)}.
+   *
+   * <p>All other type matchers require some level of bytecode inspection, e.g. {@link
+   * ElementMatchers#isAnnotatedWith(ElementMatcher)}.
+   *
+   * <p>Type matchers that need to inspect the super class hierarchy are even more expensive, e.g.
+   * {@link AgentElementMatchers#implementsInterface(ElementMatcher)}. This is because they require
+   * inspecting multiple super classes/interfaces as well (which may not even be loaded yet in which
+   * case their bytecode has to be read and inspected).
+   *
+   * @return A type matcher that rejects classloaders that do not contain desired interfaces or base
+   *     classes.
    */
-  default ElementMatcher<ClassLoader> classLoaderMatcher() {
+  default ElementMatcher<ClassLoader> classLoaderOptimization() {
     return any();
   }