Add single InstrumenterModule for group of instrumentation

dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java

@@ -6,13 +6,13 @@
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
 import static datadog.trace.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientDecorator.DECORATE;
 import static datadog.trace.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientDecorator.HTTP_REQUEST;
+import static java.util.Arrays.asList;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
-import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
-import datadog.trace.agent.tooling.InstrumenterModule;
+import datadog.trace.api.InstrumenterConfig;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
@@ -22,17 +22,18 @@
 import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
 import org.apache.http.protocol.HttpContext;
 
-@AutoService(InstrumenterModule.class)
-public class ApacheHttpAsyncClientInstrumentation extends InstrumenterModule.Tracing
+public class ApacheHttpAsyncClientInstrumentation
     implements Instrumenter.CanShortcutTypeMatching, Instrumenter.HasMethodAdvice {
 
   public ApacheHttpAsyncClientInstrumentation() {
-    super("httpasyncclient", "apache-httpasyncclient");
+    super();
   }
 
   @Override
   public boolean onlyMatchKnownTypes() {
-    return isShortcutMatchingEnabled(false);
+    return InstrumenterConfig.get()
+        .isIntegrationShortcutMatchingEnabled(
+            asList("httpasyncclient", "apache-httpasyncclient"), false);
   }
 
   @Override
@@ -58,17 +59,6 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
     return implementsInterface(named(hierarchyMarkerType()));
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".HttpHeadersInjectAdapter",
-      packageName + ".DelegatingRequestProducer",
-      packageName + ".TraceContinuedFutureCallback",
-      packageName + ".ApacheHttpAsyncClientDecorator",
-      packageName + ".HostAndRequestAsHttpUriRequest"
-    };
-  }
-
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(

dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java

@@ -0,0 +1,42 @@
+package datadog.trace.instrumentation.apachehttpasyncclient;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonMap;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.InstrumenterModule;
+import java.util.List;
+import java.util.Map;
+
+@AutoService(InstrumenterModule.class)
+public class ApacheHttpAsyncClientModule extends InstrumenterModule.Tracing {
+  public ApacheHttpAsyncClientModule() {
+    super("httpasyncclient", "apache-httpasyncclient");
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".HttpHeadersInjectAdapter",
+      packageName + ".DelegatingRequestProducer",
+      packageName + ".TraceContinuedFutureCallback",
+      packageName + ".ApacheHttpAsyncClientDecorator",
+      packageName + ".HostAndRequestAsHttpUriRequest"
+    };
+  }
+
+  @Override
+  public Map<String, String> contextStore() {
+    return singletonMap(
+        "org.apache.http.concurrent.BasicFuture", "org.apache.http.concurrent.FutureCallback");
+  }
+
+  @Override
+  public List<Instrumenter> typeInstrumentations() {
+    return asList(
+        new ApacheHttpAsyncClientInstrumentation(),
+        new ApacheHttpClientRedirectInstrumentation(),
+        new BasicFutureInstrumentation());
+  }
+}

dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java

@@ -5,9 +5,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
-import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
-import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.util.PropagationUtils;
 import java.util.Locale;
 import net.bytebuddy.asm.Advice;
@@ -24,14 +22,9 @@
  * manually. Inspired by
  * https://github.com/elastic/apm-agent-java/blob/master/apm-agent-plugins/apm-apache-httpclient-plugin/src/main/java/co/elastic/apm/agent/httpclient/ApacheHttpAsyncClientRedirectInstrumentation.java
  */
-@AutoService(InstrumenterModule.class)
-public class ApacheHttpClientRedirectInstrumentation extends InstrumenterModule.Tracing
+public class ApacheHttpClientRedirectInstrumentation
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public ApacheHttpClientRedirectInstrumentation() {
-    super("httpasyncclient", "apache-httpasyncclient", "httpclient-redirect");
-  }
-
   @Override
   public String hierarchyMarkerType() {
     return "org.apache.http.client.RedirectStrategy";

dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/BasicFutureInstrumentation.java

@@ -2,34 +2,20 @@
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.declaresField;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
-import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
 
-import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
-import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.bootstrap.InstrumentationContext;
-import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 import org.apache.http.concurrent.BasicFuture;
 import org.apache.http.concurrent.FutureCallback;
 
-@AutoService(InstrumenterModule.class)
-public final class BasicFutureInstrumentation extends InstrumenterModule.Tracing
+public final class BasicFutureInstrumentation
     implements Instrumenter.ForSingleType,
         Instrumenter.WithTypeStructure,
         Instrumenter.HasMethodAdvice {
-  public BasicFutureInstrumentation() {
-    super("httpasyncclient", "apache-httpasyncclient");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap(
-        "org.apache.http.concurrent.BasicFuture", "org.apache.http.concurrent.FutureCallback");
-  }
 
   @Override
   public String instrumentedType() {

dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaGrpcClientModule.java

@@ -0,0 +1,59 @@
+package datadog.trace.instrumentation.armeria.grpc.client;
+
+import static java.util.Arrays.asList;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.InstrumenterModule;
+import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@AutoService(InstrumenterModule.class)
+public class ArmeriaGrpcClientModule extends InstrumenterModule.Tracing {
+  public ArmeriaGrpcClientModule() {
+    super("armeria-grpc-client", "armeria-grpc", "armeria", "grpc-client", "grpc");
+  }
+
+  @Override
+  public Map<String, String> contextStore() {
+    Map<String, String> contextStore = new HashMap<>();
+    contextStore.put("io.grpc.ClientCall", AgentSpan.class.getName());
+    contextStore.put(
+        "com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer", "io.grpc.ClientCall");
+    return contextStore;
+  }
+
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return new Reference[] {
+      new Reference(
+          new String[0],
+          1,
+          "com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer",
+          null,
+          new String[0],
+          new Reference.Field[0],
+          new Reference.Method[0])
+    };
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".GrpcClientDecorator",
+      packageName + ".GrpcClientDecorator$1",
+      packageName + ".GrpcInjectAdapter"
+    };
+  }
+
+  @Override
+  public List<Instrumenter> typeInstrumentations() {
+    return asList(
+        new ArmeriaMessageDeframerInstrumentation(),
+        new ArmeriaMessageDeframerInstrumentation(),
+        new ClientCallImplInstrumentation());
+  }
+}

dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java

@@ -7,26 +7,18 @@
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
-import com.google.auto.service.AutoService;
 import com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer;
 import datadog.trace.agent.tooling.Instrumenter;
-import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.bootstrap.InstrumentationContext;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import io.grpc.ClientCall;
-import java.util.HashMap;
-import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-@AutoService(InstrumenterModule.class)
-public class ArmeriaMessageDeframerInstrumentation extends InstrumenterModule.Tracing
+public class ArmeriaMessageDeframerInstrumentation
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
-  public ArmeriaMessageDeframerInstrumentation() {
-    super("armeria-grpc-client", "armeria-grpc", "armeria", "grpc-client", "grpc");
-  }
 
   @Override
   public String hierarchyMarkerType() {
@@ -38,14 +30,6 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
     return named(hierarchyMarkerType()).or(extendsClass(named(hierarchyMarkerType())));
   }
 
-  @Override
-  public Map<String, String> contextStore() {
-    Map<String, String> contextStore = new HashMap<>(4);
-    contextStore.put("io.grpc.ClientCall", AgentSpan.class.getName());
-    contextStore.put(hierarchyMarkerType(), "io.grpc.ClientCall");
-    return contextStore;
-  }
-
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(

dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java

@@ -14,10 +14,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
-import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
-import datadog.trace.agent.tooling.InstrumenterModule;
-import datadog.trace.agent.tooling.muzzle.Reference;
 import datadog.trace.api.InstrumenterConfig;
 import datadog.trace.bootstrap.InstrumentationContext;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -28,51 +25,15 @@
 import io.grpc.Status;
 import io.grpc.StatusException;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
 import net.bytebuddy.asm.Advice;
 
-@AutoService(InstrumenterModule.class)
-public final class ClientCallImplInstrumentation extends InstrumenterModule.Tracing
+public final class ClientCallImplInstrumentation
     implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
-
-  public ClientCallImplInstrumentation() {
-    super("armeria-grpc-client", "armeria-grpc", "armeria", "grpc-client", "grpc");
-  }
-
-  @Override
-  public Map<String, String> contextStore() {
-    return Collections.singletonMap("io.grpc.ClientCall", AgentSpan.class.getName());
-  }
-
   @Override
   public String instrumentedType() {
     return "com.linecorp.armeria.internal.client.grpc.ArmeriaClientCall";
   }
 
-  @Override
-  public Reference[] additionalMuzzleReferences() {
-    return new Reference[] {
-      new Reference(
-          new String[0],
-          1,
-          "com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer",
-          null,
-          new String[0],
-          new Reference.Field[0],
-          new Reference.Method[0])
-    };
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".GrpcClientDecorator",
-      packageName + ".GrpcClientDecorator$1",
-      packageName + ".GrpcInjectAdapter"
-    };
-  }
-
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(

dd-java-agent/instrumentation/avro-1.11.3/src/main/java/datadog/trace/instrumentation/avro/AvroModule.java

@@ -0,0 +1,27 @@
+package datadog.trace.instrumentation.avro;
+
+import static java.util.Arrays.asList;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.InstrumenterModule;
+import java.util.List;
+
+@AutoService(InstrumenterModule.class)
+public class AvroModule extends InstrumenterModule.Tracing {
+  public AvroModule() {
+    super("avro");
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {
+      packageName + ".SchemaExtractor", packageName + ".SchemaExtractor$1",
+    };
+  }
+
+  @Override
+  public List<Instrumenter> typeInstrumentations() {
+    return asList(new GenericDatumReaderInstrumentation(), new GenericDatumWriterInstrumentation());
+  }
+}

dd-java-agent/instrumentation/avro-1.11.3/src/main/java/datadog/trace/instrumentation/avro/GenericDatumReaderInstrumentation.java

@@ -5,31 +5,17 @@
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 
-import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
-import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 import org.apache.avro.generic.GenericDatumReader;
 
-@AutoService(InstrumenterModule.class)
-public final class GenericDatumReaderInstrumentation extends InstrumenterModule.Tracing
+public final class GenericDatumReaderInstrumentation
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public GenericDatumReaderInstrumentation() {
-    super("avro");
-  }
-
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".SchemaExtractor", packageName + ".SchemaExtractor$1",
-    };
-  }
-
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(