Remove more manually listed instrumentation helpers

dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java

@@ -29,11 +29,6 @@ public void methodAdvice(MethodTransformer transformer) {
         S3ClientInstrumentation.class.getName() + "$AwsS3BuilderAdvice");
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {packageName + ".S3Interceptor"};
-  }
-
   public static class AwsS3BuilderAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void addHandler(@Advice.Return final List<ExecutionInterceptor> interceptors) {

dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginInstrumentation.java

@@ -32,16 +32,6 @@ public String[] knownMatchingTypes() {
     };
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".StateAdvice",
-      packageName + ".AxwayHTTPPluginDecorator",
-      packageName + ".HTTPPluginAdvice",
-      packageName + ".ServerTransactionAdvice",
-    };
-  }
-
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(

dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestInstrumentation.java

@@ -16,15 +16,6 @@ public BaseRequestInstrumentation() {
     super("couchbase", "couchbase-3");
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".CouchbaseClientDecorator",
-      packageName + ".DatadogRequestSpan",
-      packageName + ".DatadogRequestTracer",
-    };
-  }
-
   @Override
   public String instrumentedType() {
     return "com.couchbase.client.core.msg.BaseRequest";

dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderInstrumentation.java

@@ -17,16 +17,6 @@ public CoreEnvironmentBuilderInstrumentation() {
     super("couchbase", "couchbase-3");
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".CouchbaseClientDecorator",
-      packageName + ".DatadogRequestSpan",
-      packageName + ".DatadogRequestTracer",
-      packageName + ".SeedNodeHelper",
-    };
-  }
-
   @Override
   public Map<String, String> contextStore() {
     return Collections.singletonMap("com.couchbase.client.core.Core", String.class.getName());

dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilInstrumentation.java

@@ -17,15 +17,6 @@ public DefaultErrorUtilInstrumentation() {
     super("couchbase", "couchbase-3");
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".CouchbaseClientDecorator",
-      packageName + ".DatadogRequestSpan",
-      packageName + ".DatadogRequestTracer",
-    };
-  }
-
   @Override
   public String instrumentedType() {
     return "com.couchbase.client.core.error.DefaultErrorUtil";

dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestInstrumentation.java

@@ -15,16 +15,6 @@ public BaseRequestInstrumentation() {
     super("couchbase", "couchbase-3");
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".CouchbaseClientDecorator",
-      packageName + ".DatadogRequestSpan",
-      packageName + ".DatadogRequestSpan$1",
-      packageName + ".DatadogRequestTracer",
-    };
-  }
-
   @Override
   public String instrumentedType() {
     return "com.couchbase.client.core.msg.BaseRequest";

dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilInstrumentation.java

@@ -16,16 +16,6 @@ public DefaultErrorUtilInstrumentation() {
     super("couchbase", "couchbase-3");
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".CouchbaseClientDecorator",
-      packageName + ".DatadogRequestSpan",
-      packageName + ".DatadogRequestSpan$1",
-      packageName + ".DatadogRequestTracer",
-    };
-  }
-
   @Override
   public String instrumentedType() {
     return "com.couchbase.client.core.error.DefaultErrorUtil";

dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/GraalNativeImageModule.java

@@ -12,7 +12,6 @@ public class GraalNativeImageModule extends AbstractNativeImageModule {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      packageName + ".DeleteFieldAdvice",
       packageName + ".Target_com_datadog_profiling_agent_ProcessContext",
       packageName + ".Target_datadog_jctools_util_UnsafeRefArrayAccess",
       packageName + ".Target_org_datadog_jmxfetch_App",

dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java

@@ -31,20 +31,6 @@ public String instrumentedType() {
     return "org.gradle.invocation.DefaultGradle";
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".GradleUtils",
-      packageName + ".GradleProjectConfigurator",
-      packageName + ".GradleProjectConfigurator$_configureCompilerPlugin_closure1",
-      packageName + ".GradleProjectConfigurator$_configureJacoco_closure2",
-      packageName + ".GradleProjectConfigurator$_configureJacoco_closure3",
-      packageName + ".GradleProjectConfigurator$_forEveryTestTask_closure4",
-      packageName + ".GradleBuildListener",
-      packageName + ".GradleBuildListener$TestTaskExecutionListener"
-    };
-  }
-
   @Override
   public boolean isEnabled() {
     return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();

dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy

@@ -35,11 +35,6 @@ import java.util.regex.Pattern
  */
 class GradleProjectConfigurator {
 
-  /*
-   * Each Groovy Closure in here is a separate class.
-   * When adding or removing a closure, be sure to update {@link GradleBuildListenerInstrumentation#helperClassNames()}
-   */
-
   public static final GradleProjectConfigurator INSTANCE = new GradleProjectConfigurator()
 
   private static final String JACOCO_PLUGIN_ID = 'jacoco'

dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java

@@ -34,13 +34,6 @@ public String instrumentedType() {
     return "org.gradle.internal.service.ScopedServiceRegistry";
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".CiVisibilityGradleListenerInjector_8_10",
-    };
-  }
-
   @Override
   public boolean isEnabled() {
     return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();

dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java

@@ -33,13 +33,6 @@ public String instrumentedType() {
     return "org.gradle.internal.service.scopes.BuildScopeServices";
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".CiVisibilityGradleListenerInjector_8_3",
-    };
-  }
-
   @Override
   public boolean isEnabled() {
     return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled();

dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java

@@ -42,13 +42,6 @@ public void methodAdvice(MethodTransformer transformer) {
         GradleLauncherInstrumentation.class.getName() + "$PropertiesAugmentationAdvice");
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".GradleDaemonInjectionUtils",
-    };
-  }
-
   public static class PropertiesAugmentationAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void addJavaagentToGradleDaemonProperties(

dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastModule.java

@@ -28,16 +28,6 @@ protected boolean defaultEnabled() {
     return DEFAULT_ENABLED;
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".HazelcastConstants",
-      packageName + ".HazelcastDecorator",
-      packageName + ".SpanFinishingExecutionCallback",
-      packageName + ".InvocationAdvice"
-    };
-  }
-
   @Override
   public Map<String, String> contextStore() {
     return Collections.singletonMap(

dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java

@@ -56,7 +56,6 @@ public String[] helperClassNames() {
       packageName + ".BodyHandlerWrapper",
       packageName + ".BodyHandlerWrapper$BodySubscriberWrapper",
       packageName + ".BodyHandlerWrapper$SubscriptionWrapper",
-      packageName + ".CompletableFutureWrapper",
       packageName + ".JavaNetClientDecorator",
       packageName + ".ResponseConsumer"
     };

dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java

@@ -41,13 +41,6 @@ public String instrumentedType() {
     return "redis.clients.jedis.Connection";
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".JedisClientDecorator",
-    };
-  }
-
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(

dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/ContainerRequestInstrumentation.java

@@ -39,13 +39,6 @@ public String instrumentedType() {
     return "org.glassfish.jersey.server.ContainerRequest";
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".JerseyTaintHelper",
-    };
-  }
-
   @RequiresRequestContext(RequestContextSlot.IAST)
   public static class SetPropertyAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)

dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java

@@ -35,7 +35,6 @@ public String[] helperClassNames() {
     return new String[] {
       packageName + ".JettyClientDecorator",
       "datadog.trace.instrumentation.jetty_client.HeadersInjectAdapter",
-      "datadog.trace.instrumentation.jetty_client.CallbackWrapper",
       packageName + ".SpanFinishingCompleteListener"
     };
   }

dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java

@@ -47,7 +47,6 @@ public String[] helperClassNames() {
     return new String[] {
       packageName + ".JettyClientDecorator",
       "datadog.trace.instrumentation.jetty_client.HeadersInjectAdapter",
-      "datadog.trace.instrumentation.jetty_client.CallbackWrapper",
       packageName + ".SpanFinishingCompleteListener"
     };
   }

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java

@@ -51,10 +51,6 @@ public String[] helperClassNames() {
       packageName + ".ExtractAdapter$Response",
       packageName + ".JettyDecorator",
       packageName + ".RequestURIDataAdapter",
-      packageName + ".JettyServerAdvice",
-      packageName + ".JettyServerAdvice$ContextTrackingAdvice",
-      packageName + ".JettyServerAdvice$HandleAdvice",
-      packageName + ".JettyServerAdvice$ResetAdvice",
       "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction",
       "datadog.trace.instrumentation.jetty.JettyBlockingHelper",
     };

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java

@@ -36,10 +36,6 @@ public String[] helperClassNames() {
       packageName + ".ExtractAdapter$Response",
       packageName + ".JettyDecorator",
       packageName + ".RequestURIDataAdapter",
-      packageName + ".JettyServerAdvice",
-      packageName + ".JettyServerAdvice$ContextTrackingAdvice",
-      packageName + ".JettyServerAdvice$HandleAdvice",
-      packageName + ".JettyServerAdvice$ResetAdvice",
       packageName + ".JettyRunnableWrapper"
     };
   }

dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java

@@ -57,7 +57,6 @@ public String[] helperClassNames() {
       packageName + ".SkippedByDatadog",
       packageName + ".JUnit4Utils",
       packageName + ".TracingListener",
-      packageName + ".CucumberTracingListener",
     };
   }
 

dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java

@@ -53,17 +53,6 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
         .and(not(extendsClass(named("io.cucumber.junit.FeatureRunner"))));
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".TestEventsHandlerHolder",
-      packageName + ".SkippedByDatadog",
-      packageName + ".JUnit4Utils",
-      packageName + ".TracingListener",
-      packageName + ".JUnit4TracingListener",
-    };
-  }
-
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(

dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java

@@ -36,17 +36,6 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
     return extendsClass(named(hierarchyMarkerType()));
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".TestEventsHandlerHolder",
-      packageName + ".SkippedByDatadog",
-      packageName + ".JUnit4Utils",
-      packageName + ".TracingListener",
-      packageName + ".JUnit4TracingListener",
-    };
-  }
-
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(

dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java

@@ -34,17 +34,6 @@ public String[] knownMatchingTypes() {
     };
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".TestEventsHandlerHolder",
-      packageName + ".SkippedByDatadog",
-      packageName + ".JUnit4Utils",
-      packageName + ".TracingListener",
-      packageName + ".JUnit4TracingListener",
-    };
-  }
-
   @Override
   public int order() {
     // Should be applied after datadog.trace.instrumentation.junit4.JUnit4Instrumentation,

dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5NodeTestTaskContextInstrumentation.java

@@ -33,13 +33,6 @@ public String instrumentedType() {
     return "org.junit.platform.engine.support.hierarchical.NodeTestTaskContext";
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".ThrowableCollectorFactoryWrapper", parentPackageName + ".JUnitPlatformUtils"
-    };
-  }
-
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(

dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java

@@ -54,7 +54,6 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      packageName + ".KafkaDecorator",
       "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
       "datadog.trace.instrumentation.kafka_common.PendingConfig",
       "datadog.trace.instrumentation.kafka_common.MetadataState",

dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java

@@ -48,7 +48,6 @@ public String[] helperClassNames() {
       "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
       "datadog.trace.instrumentation.kafka_common.PendingConfig",
       "datadog.trace.instrumentation.kafka_common.MetadataState",
-      packageName + ".ProducerContextPropagationAdvice",
     };
   }
 

dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java

@@ -40,7 +40,6 @@ public ElementMatcher<TypeDescription> hierarchyMatcher() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      packageName + ".KafkaDecorator",
       "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper",
       "datadog.trace.instrumentation.kafka_common.PendingConfig",
       "datadog.trace.instrumentation.kafka_common.MetadataState",

dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java

@@ -72,7 +72,6 @@ public String instrumentedType() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.trace.instrumentation.kafka_clients.TextMapInjectAdapterInterface",
       "datadog.trace.instrumentation.kafka_clients.TracingIterableDelegator",
       "datadog.trace.instrumentation.kafka_common.Utils",
       "datadog.trace.instrumentation.kafka_common.StreamingContext",