diff --git a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeModule.java b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeModule.java index d32cbd76a86..77799dbba4d 100644 --- a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeModule.java +++ b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeModule.java @@ -15,13 +15,6 @@ public AerospikeModule() { super("aerospike"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AerospikeClientDecorator", packageName + ".TracingListener", - }; - } - @Override public List typeInstrumentations() { final List ret = new ArrayList<>(4); diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java index 846a9c6b836..e37e6b94498 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java @@ -32,24 +32,6 @@ public String[] knownMatchingTypes() { return new String[] {"akka.http.scaladsl.Http2Ext", "akka.http.impl.engine.http2.Http2Ext"}; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".DatadogWrapperHelper", - packageName + ".DatadogWrapperHelper$SwappedContextScope", - packageName + ".DatadogAsyncHandlerWrapper", - packageName + ".DatadogAsyncHandlerWrapper$1", - packageName + ".DatadogAsyncHandlerWrapper$2", - packageName + ".AkkaHttpServerHeaders", - packageName + ".AkkaHttpServerDecorator", - packageName + ".RecoverFromBlockedExceptionPF", - packageName + ".UriAdapter", - packageName + ".appsec.AkkaBlockResponseFunction", - packageName + ".appsec.BlockingResponseHelper", - packageName + ".appsec.ScalaListCollector", - }; - } - @Override public Reference[] additionalMuzzleReferences() { return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences(); diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java index 02d3d90a05c..d2555ed1c8a 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java @@ -61,27 +61,6 @@ public String instrumentedType() { return "akka.http.scaladsl.HttpExt"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".DatadogWrapperHelper", - packageName + ".DatadogWrapperHelper$SwappedContextScope", - packageName + ".DatadogServerRequestResponseFlowWrapper", - packageName + ".DatadogServerRequestResponseFlowWrapper$1", - packageName + ".DatadogServerRequestResponseFlowWrapper$1$1", - packageName + ".DatadogServerRequestResponseFlowWrapper$1$2", - packageName + ".DatadogServerRequestResponseFlowWrapper$1$3", - packageName + ".DatadogServerRequestResponseFlowWrapper$1$4", - packageName + ".AkkaHttpServerHeaders", - packageName + ".AkkaHttpServerDecorator", - packageName + ".UriAdapter", - packageName + ".RecoverFromBlockedExceptionPF", - packageName + ".appsec.BlockingResponseHelper", - packageName + ".appsec.ScalaListCollector", - packageName + ".appsec.AkkaBlockResponseFunction", - }; - } - @Override public Reference[] additionalMuzzleReferences() { return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences(); diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java index dc9e6f1376f..cab7d647167 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java @@ -25,13 +25,6 @@ public String instrumentedType() { return "akka.http.scaladsl.server.ExceptionHandler$"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".MarkSpanAsErroredPF", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java index dcfcfe207cb..83450efe544 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java @@ -41,18 +41,6 @@ public String hierarchyMarkerType() { return "akka.http.impl.engine.server.HttpServerBluePrint"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AkkaBlockResponseFunction", - packageName + ".BlockingResponseHelper", - packageName + ".ScalaListCollector", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders", - "datadog.trace.instrumentation.akkahttp.UriAdapter", - }; - } - @Override public Reference[] additionalMuzzleReferences() { return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences(); diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java index 38c8c64170c..8137d993f67 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java @@ -27,20 +27,6 @@ public FormDataToStrictInstrumentation() { super("akka-http"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".UnmarshallerHelpers", - packageName + ".UnmarshallerHelpers$UnmarkStrictFormOngoingOnUnsupportedException", - packageName + ".AkkaBlockResponseFunction", - packageName + ".BlockingResponseHelper", - packageName + ".ScalaListCollector", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders", - "datadog.trace.instrumentation.akkahttp.UriAdapter", - }; - } - @Override public String instrumentedType() { return "akka.http.scaladsl.model.Multipart$FormData"; diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java index 3901cd579bf..5b779ef34dc 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java @@ -22,20 +22,6 @@ public JacksonUnmarshallerInstrumentation() { super("akka-http"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".UnmarshallerHelpers", - packageName + ".UnmarshallerHelpers$UnmarkStrictFormOngoingOnUnsupportedException", - packageName + ".AkkaBlockResponseFunction", - packageName + ".BlockingResponseHelper", - packageName + ".ScalaListCollector", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders", - "datadog.trace.instrumentation.akkahttp.UriAdapter", - }; - } - @Override public Reference[] additionalMuzzleReferences() { return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences(); diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java index 3d74ad319b6..2b29bfcf6a8 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java @@ -25,20 +25,6 @@ public MultipartUnmarshallersInstrumentation() { super("akka-http"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".UnmarshallerHelpers", - packageName + ".UnmarshallerHelpers$UnmarkStrictFormOngoingOnUnsupportedException", - packageName + ".AkkaBlockResponseFunction", - packageName + ".BlockingResponseHelper", - packageName + ".ScalaListCollector", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders", - "datadog.trace.instrumentation.akkahttp.UriAdapter", - }; - } - @Override public String[] knownMatchingTypes() { return new String[] { diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java index efd4b95c30b..3f5bb502563 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java @@ -29,20 +29,6 @@ public PredefinedFromEntityUnmarshallersInstrumentation() { super("akka-http"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".UnmarshallerHelpers", - packageName + ".UnmarshallerHelpers$UnmarkStrictFormOngoingOnUnsupportedException", - packageName + ".AkkaBlockResponseFunction", - packageName + ".BlockingResponseHelper", - packageName + ".ScalaListCollector", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders", - "datadog.trace.instrumentation.akkahttp.UriAdapter", - }; - } - @Override public Reference[] additionalMuzzleReferences() { return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences(); diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java index 6b7212f2a5b..70a3e21ca95 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java @@ -30,20 +30,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".UnmarshallerHelpers", - packageName + ".UnmarshallerHelpers$UnmarkStrictFormOngoingOnUnsupportedException", - packageName + ".AkkaBlockResponseFunction", - packageName + ".BlockingResponseHelper", - packageName + ".ScalaListCollector", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders", - "datadog.trace.instrumentation.akkahttp.UriAdapter", - }; - } - @Override public Reference[] additionalMuzzleReferences() { return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences(); diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java index 9ee0eae4bf7..d6d0012dff0 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java @@ -32,20 +32,6 @@ public String instrumentedType() { return "akka.http.scaladsl.common.StrictForm$"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".UnmarshallerHelpers", - packageName + ".UnmarshallerHelpers$UnmarkStrictFormOngoingOnUnsupportedException", - packageName + ".AkkaBlockResponseFunction", - packageName + ".BlockingResponseHelper", - packageName + ".ScalaListCollector", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator", - "datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders", - "datadog.trace.instrumentation.akkahttp.UriAdapter", - }; - } - @Override public Reference[] additionalMuzzleReferences() { return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences(); diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java index 2e6f61d7088..a484aa29110 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java @@ -35,14 +35,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.TaintCookieFunction", - packageName + ".helpers.TaintOptionalCookieFunction", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { String traitName = "akka.http.scaladsl.server.directives.CookieDirectives"; diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java index 306a8bfea0d..d1104b47321 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java @@ -47,15 +47,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.TaintUriFunction", - packageName + ".helpers.TaintRequestFunction", - packageName + ".helpers.TaintRequestContextFunction", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { instrumentDirective(transformer, "extractUri", "TaintUriDirectiveAdvice"); diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java index 90d2587fd87..1a0ccc7ff7f 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java @@ -46,17 +46,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.ScalaToJava", - packageName + ".helpers.TaintMultiMapFunction", - packageName + ".helpers.TaintMapFunction", - packageName + ".helpers.TaintSeqFunction", - packageName + ".helpers.TaintSingleParameterFunction", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { // the Java API delegates to the Scala API diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java index c76903ed185..b2bfc3ecee5 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java @@ -42,13 +42,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.TaintUnmarshaller", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java index f51328e4312..35818620e8d 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java @@ -45,17 +45,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.ScalaToJava", - packageName + ".helpers.TaintMultiMapFunction", - packageName + ".helpers.TaintMapFunction", - packageName + ".helpers.TaintSeqFunction", - packageName + ".helpers.TaintSingleParameterFunction", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { // the Java API delegates to the Scala API diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java index 18884358437..4ef8ecd7efa 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java @@ -44,13 +44,6 @@ public String hierarchyMarkerType() { return "akka.http.scaladsl.unmarshalling.Unmarshaller"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.TaintFutureHelper", - }; - } - @Override public ElementMatcher hierarchyMatcher() { return nameStartsWith("akka.http.scaladsl.unmarshalling.") diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/ParameterDirectivesImplInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/ParameterDirectivesImplInstrumentation.java index 55ce72a8e26..ae28313541d 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/ParameterDirectivesImplInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/src/main/java/datadog/trace/instrumentation/akkahttp102/iast/ParameterDirectivesImplInstrumentation.java @@ -36,13 +36,6 @@ public String instrumentedType() { return "akka.http.scaladsl.server.directives.ParameterDirectives$Impl$"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.TaintParametersFunction", - }; - } - @Override public Reference[] additionalMuzzleReferences() { // just so we can use assertInverse in the muzzle directive diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java index 8dcec31c16f..a9314c7acec 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java @@ -15,18 +15,6 @@ public ApacheHttpAsyncClientModule() { super("httpasyncclient", "apache-httpasyncclient"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HttpHeadersInjectAdapter", - packageName + ".DelegatingRequestProducer", - packageName + ".TraceContinuedFutureCallback", - packageName + ".ApacheHttpAsyncClientDecorator", - packageName + ".HostAndRequestAsHttpUriRequest", - packageName + ".RedirectHelper" - }; - } - @Override public Map contextStore() { return singletonMap( diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java index aea16047e36..37de9441df0 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java @@ -67,17 +67,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ApacheHttpClientDecorator", - packageName + ".HttpHeadersInjectAdapter", - packageName + ".HostAndRequestAsHttpUriRequest", - packageName + ".HelperMethods", - packageName + ".WrappingStatusSettingResponseHandler", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { // There are 8 execute(...) methods. Depending on the version, they may or may not delegate to diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java index 5803ecab414..05c623d608d 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java @@ -68,17 +68,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ApacheHttpClientDecorator", - packageName + ".HttpHeadersInjectAdapter", - packageName + ".DelegatingRequestChannel", - packageName + ".DelegatingRequestProducer", - packageName + ".TraceContinuedFutureCallback" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvices( diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java index 9d044b58f32..d283f2715b3 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java @@ -60,17 +60,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ApacheHttpClientDecorator", - packageName + ".HttpHeadersInjectAdapter", - packageName + ".HostAndRequestAsHttpUriRequest", - packageName + ".HelperMethods", - packageName + ".WrappingStatusSettingResponseHandler", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvices( diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaGrpcClientModule.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaGrpcClientModule.java index 1d0542d10ea..fcd8ea03cfb 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaGrpcClientModule.java +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaGrpcClientModule.java @@ -40,15 +40,6 @@ public Reference[] additionalMuzzleReferences() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".GrpcClientDecorator", - packageName + ".GrpcClientDecorator$1", - packageName + ".GrpcInjectAdapter" - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java index 3c3f9e3a0ca..bb9f2a4ed83 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java @@ -38,18 +38,6 @@ public Reference[] additionalMuzzleReferences() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".GrpcServerDecorator", - packageName + ".GrpcServerDecorator$1", - packageName + ".GrpcExtractAdapter", - packageName + ".TracingServerInterceptor", - packageName + ".TracingServerInterceptor$TracingServerCall", - packageName + ".TracingServerInterceptor$TracingServerCallListener", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java index d6128ce2235..6de993fa6d0 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java @@ -28,13 +28,6 @@ public ElementMatcher.Junction classLoaderMatcher() { return hasClassNamed("com.linecorp.armeria.server.ServiceRequestContext"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AttributeKeys", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java index 89f85cdfdf3..33a79c89341 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java +++ b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java @@ -25,13 +25,6 @@ public String instrumentedType() { return "com.linecorp.armeria.server.jetty.JettyService"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AttributeKeys", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbClientInstrumentation.java index 2dd22d1ae6c..1498426cef1 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/dynamodb/DynamoDbClientInstrumentation.java @@ -29,11 +29,6 @@ public void methodAdvice(MethodTransformer transformer) { DynamoDbClientInstrumentation.class.getName() + "$AwsDynamoDbBuilderAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".DynamoDbInterceptor", packageName + ".DynamoDbUtil"}; - } - public static class AwsDynamoDbBuilderAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void addHandler(@Advice.Return final List interceptors) { diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java index 9dff23eeb67..c74b5c36e65 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeClientInstrumentation.java @@ -29,13 +29,6 @@ public void methodAdvice(MethodTransformer transformer) { EventBridgeClientInstrumentation.class.getName() + "$AwsEventBridgeBuilderAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".EventBridgeInterceptor", packageName + ".TextMapInjectAdapter" - }; - } - public static class AwsEventBridgeBuilderAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void addHandler(@Advice.Return final List interceptors) { diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java index 0f662349dae..7f62f4337d9 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java @@ -55,13 +55,6 @@ public ElementMatcher hierarchyMatcher() { .or(named("com.amazonaws.services.lambda.runtime.RequestHandler"))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".LambdaHandlerDecorator", - }; - } - @Override protected boolean defaultEnabled() { return ConfigHelper.env(HANDLER_ENV_NAME) != null; diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java index 8c370ce03b8..85e69c37492 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java @@ -21,18 +21,6 @@ protected AwsSdkModule(String namespace, String instrumentationName) { this.namespace = namespace; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AwsSdkClientDecorator", - packageName + ".GetterAccess", - packageName + ".GetterAccess$1", - packageName + ".TracingRequestHandler", - packageName + ".AwsNameCache", - packageName + ".OnErrorDecorator", - }; - } - @Override public Map contextStore() { Map map = new java.util.HashMap<>(); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkModule.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkModule.java index bfe441c52e9..d2202c1f730 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkModule.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkModule.java @@ -16,14 +16,6 @@ public AwsSdkModule() { super("aws-sdk"); } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.aws.v2.AwsSdkClientDecorator", - "datadog.trace.instrumentation.aws.v2.TracingExecutionInterceptor" - }; - } - @Override public Map contextStore() { return Collections.singletonMap( diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnClientInstrumentation.java index 5c88a55278b..90b93d108d9 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sfn/SfnClientInstrumentation.java @@ -31,15 +31,6 @@ public void methodAdvice(MethodTransformer transformer) { SfnClientInstrumentation.class.getName() + "$AwsSfnBuilderAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SfnInterceptor", - packageName + ".InputAttributeInjector", - packageName + ".TextMapInjectAdapter" - }; - } - public static class AwsSfnBuilderAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void addHandler(@Advice.Return final List interceptors) { diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java index bd80bfd554a..668453bd753 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsClientInstrumentation.java @@ -34,11 +34,6 @@ public void methodAdvice(MethodTransformer transformer) { SnsClientInstrumentation.class.getName() + "$HandlerChainAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".SnsInterceptor", packageName + ".TextMapInjectAdapter"}; - } - @Override public Map contextStore() { return Collections.singletonMap( diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java index 6cd9b991ad1..3770ec7df55 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/SnsClientInstrumentation.java @@ -32,11 +32,6 @@ public void methodAdvice(MethodTransformer transformer) { SnsClientInstrumentation.class.getName() + "$AwsSnsBuilderAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".SnsInterceptor", packageName + ".TextMapInjectAdapter"}; - } - @Override public Map contextStore() { return Collections.singletonMap( diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java index 8c47ff8f660..e8832605179 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java @@ -36,13 +36,6 @@ public void methodAdvice(MethodTransformer transformer) { SqsClientInstrumentation.class.getName() + "$HandlerChainAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SqsInterceptor", packageName + ".MessageAttributeInjector" - }; - } - @Override public Map contextStore() { return Collections.singletonMap( diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java index 9c56fb8b2fe..99bcba2fe47 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsReceiveResultInstrumentation.java @@ -31,17 +31,6 @@ public boolean isEnabled() { && !InstrumenterConfig.get().isLegacyInstrumentationEnabled(false, "aws-sdk"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".MessageExtractAdapter", - packageName + ".SqsDecorator", - packageName + ".TracingIterator", - packageName + ".TracingList", - packageName + ".TracingListIterator" - }; - } - @Override public Map contextStore() { return singletonMap( diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsModule.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsModule.java index 4d2fe577bd1..a15c006b8bb 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsModule.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsModule.java @@ -16,20 +16,6 @@ public SqsModule() { super("sqs", "aws-sdk"); } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.aws.v2.sqs.SqsInterceptor", - "datadog.trace.instrumentation.aws.v2.sqs.MessageAttributeInjector", - "datadog.trace.instrumentation.aws.v2.sqs.MessageExtractAdapter", - "datadog.trace.instrumentation.aws.v2.sqs.SqsDecorator", - "datadog.trace.instrumentation.aws.v2.sqs.SqsReceiveResponseInternalAccess", - "datadog.trace.instrumentation.aws.v2.sqs.TracingIterator", - "datadog.trace.instrumentation.aws.v2.sqs.TracingList", - "datadog.trace.instrumentation.aws.v2.sqs.TracingListIterator" - }; - } - @Override public Map contextStore() { Map contextStore = new java.util.HashMap<>(); diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/Axis2Module.java b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/Axis2Module.java index feccf5b6a9e..0473ee14c30 100644 --- a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/Axis2Module.java +++ b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/Axis2Module.java @@ -13,13 +13,6 @@ public Axis2Module() { super("axis2"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AxisMessageDecorator", packageName + ".TextMapInjectAdapter", - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java b/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java index cd2cfe5e65a..e54b78a9e8d 100644 --- a/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java +++ b/dd-java-agent/instrumentation/azure-functions-1.2.2/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java @@ -49,13 +49,6 @@ public ElementMatcher hierarchyMatcher() { isAnnotatedWith(named("com.microsoft.azure.functions.annotation.FunctionName"))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AzureFunctionsDecorator", packageName + ".HttpRequestMessageExtractAdapter" - }; - } - public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvices( isMethod() diff --git a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/CicsModule.java b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/CicsModule.java index 68b70d01443..5c8fc4ec917 100644 --- a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/CicsModule.java +++ b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/CicsModule.java @@ -13,11 +13,6 @@ public CicsModule() { super("cics"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".CicsDecorator"}; - } - @Override public List typeInstrumentations() { return asList(new ECIInteractionInstrumentation(), new JavaGatewayInterfaceInstrumentation()); diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadAppSecInstrumentation.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadAppSecInstrumentation.java index b7c65c95f97..50ff915de66 100644 --- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadAppSecInstrumentation.java +++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadAppSecInstrumentation.java @@ -35,13 +35,6 @@ public String instrumentedType() { return "org.apache.commons.fileupload.servlet.ServletFileUpload"; } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.commons.fileupload.FileItemContentReader", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java index f7a64539c31..87fdd9c5637 100644 --- a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java @@ -38,13 +38,6 @@ public String instrumentedType() { return "org.apache.commons.httpclient.HttpClient"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CommonsHttpClientDecorator", packageName + ".HttpHeadersInjectAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvices( diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreInstrumentation.java index 626bd31b9c4..5113c625220 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreInstrumentation.java @@ -47,13 +47,6 @@ public Reference[] additionalMuzzleReferences() { return new Reference[] {TRACING_IDENTIFIERS_REFERENCE, SUSPICIOUS_EXPIRY_REFERENCE}; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SeedNodeHelper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderInstrumentation.java index db9928c9cf9..42a4996de50 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreEnvironmentBuilderInstrumentation.java @@ -18,18 +18,6 @@ public CoreEnvironmentBuilderInstrumentation() { super("couchbase", "couchbase-3"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CouchbaseClientDecorator", - packageName + ".DatadogRequestSpan", - packageName + ".DatadogRequestSpan$1", - packageName + ".DatadogRequestTracer", - packageName + ".DelegatingRequestSpan", - packageName + ".DelegatingRequestTracer" - }; - } - @Override public Map contextStore() { return Collections.singletonMap("com.couchbase.client.core.Core", String.class.getName()); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreInstrumentation.java index ff5ff432005..97a06b6b174 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/CoreInstrumentation.java @@ -34,13 +34,6 @@ public Map contextStore() { return Collections.singletonMap("com.couchbase.client.core.Core", String.class.getName()); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SeedNodeHelper", packageName + ".ConnectionStringHelper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java b/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java index 1d39b8b3396..6d68cb71dc5 100644 --- a/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java +++ b/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java @@ -33,11 +33,6 @@ public ElementMatcher hierarchyMatcher() { .and(namedNoneOf("io.cucumber.core.runner.CoreStepDefinition")); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".CucumberStepDecorator"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/InvokerInstrumentation.java b/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/InvokerInstrumentation.java index c1625b98746..aa3cc4e9d07 100644 --- a/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/InvokerInstrumentation.java +++ b/dd-java-agent/instrumentation/cxf-2.1/src/main/java/datadog/trace/instrumentation/cxf/InvokerInstrumentation.java @@ -39,13 +39,6 @@ public ElementMatcher hierarchyMatcher() { return HierarchyMatchers.implementsInterface(NameMatchers.named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ServletHelper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java index 35ebea05e81..3173e479158 100644 --- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java +++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAnnotationInstrumentation.java @@ -30,13 +30,6 @@ public ElementMatcher hierarchyMatcher() { return declaresMethod(isAnnotatedWith(named(hierarchyMarkerType()))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TraceDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java index 56b2c6dcacd..3be53e102d4 100644 --- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java @@ -74,13 +74,6 @@ public ElementMatcher hierarchyMatcher() { return declaresMethod(isAnnotatedWith(methodTraceMatcher)); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TraceDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice(isAnnotatedWith(methodTraceMatcher), packageName + ".TraceAdvice"); diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusModule.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusModule.java index 70ab74ef173..6227123214c 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusModule.java +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/DatanucleusModule.java @@ -13,13 +13,6 @@ public DatanucleusModule() { super("datanucleus"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".DatanucleusDecorator", - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java index f46dc18f3f3..bc1184e4a59 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java @@ -30,16 +30,6 @@ public String instrumentedType() { return "com.datastax.driver.core.Cluster$Manager"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CassandraClientDecorator", - packageName + ".TracingSession", - packageName + ".TracingSession$SessionTransfomer", - packageName + ".TracingSession$1", - }; - } - @Override public Map contextStore() { return Collections.singletonMap("com.datastax.driver.core.Cluster", String.class.getName()); diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java index c6c0b8e0c05..791b3b0375a 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClusterInstrumentation.java @@ -41,13 +41,6 @@ public ElementMatcher.Junction classLoaderMatcher() { return not(hasClassNamed("com.datastax.driver.core.EndPoint")); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ContactPointsUtil", - }; - } - @Override public String muzzleDirective() { return "cluster"; diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java index 19096714f36..377279187d0 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/src/main/java/datadog/trace/instrumentation/datastax/cassandra38/CassandraClusterInstrumentation.java @@ -40,13 +40,6 @@ public ElementMatcher.Junction classLoaderMatcher() { return hasClassNamed("com.datastax.driver.core.EndPoint"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ContactPointsUtil", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java index 37b198283b3..e692369ca56 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java +++ b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java @@ -34,11 +34,6 @@ public FinatraInstrumentation() { super("finatra"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".FinatraDecorator", packageName + ".Listener"}; - } - @Override public String hierarchyMarkerType() { return "com.twitter.finatra.http.internal.routing.Route"; diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableInstrumentation.java b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableInstrumentation.java index f8ed9dc6100..54ca9b2f1c9 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableInstrumentation.java +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/src/main/java/datadog/trace/instrumentation/freemarker24/DollarVariableInstrumentation.java @@ -37,13 +37,6 @@ public String instrumentedType() { return FREEMARKER_CORE + ".DollarVariable"; } - @Override - public String[] helperClassNames() { - return new String[] { - FREEMARKER_CORE + ".DollarVariable24Helper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/datadog/trace/instrumentation/freemarker9/DollarVariableInstrumentation.java b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/datadog/trace/instrumentation/freemarker9/DollarVariableInstrumentation.java index 5f64b19ced9..38935ea363c 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/datadog/trace/instrumentation/freemarker9/DollarVariableInstrumentation.java +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/src/main/java/datadog/trace/instrumentation/freemarker9/DollarVariableInstrumentation.java @@ -45,11 +45,6 @@ public String instrumentedType() { return FREEMARKER_CORE + ".DollarVariable"; } - @Override - public String[] helperClassNames() { - return new String[] {FREEMARKER_CORE + ".DollarVariable2_3_9Helper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/GooglePubSubModule.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/GooglePubSubModule.java index ce0915bfbe1..6b227b50dab 100644 --- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/GooglePubSubModule.java +++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/GooglePubSubModule.java @@ -21,18 +21,6 @@ public GooglePubSubModule() { super("google-pubsub"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".PubSubDecorator", - packageName + ".PubSubDecorator$RegexExtractor", - packageName + ".TextMapInjectAdapter", - packageName + ".TextMapExtractAdapter", - packageName + ".MessageReceiverWrapper", - packageName + ".MessageReceiverWithAckResponseWrapper", - }; - } - @Override public Map> excludedClasses() { return singletonMap(RUNNABLE, singletonList("com.google.api.gax.rpc.Watchdog")); diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeModule.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeModule.java index 7ad44b29dec..56465905ab0 100644 --- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeModule.java +++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/VMRuntimeModule.java @@ -34,11 +34,6 @@ public void methodAdvice(MethodTransformer transformer) { isMethod().and(named("initialize")), VMRuntimeModule.class.getName() + "$InitializeAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] {"datadog.trace.agent.tooling.nativeimage.TracerActivation"}; - } - @Override public boolean injectHelperDependencies() { return true; diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLUnwrapExceptionInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLUnwrapExceptionInstrumentation.java index bfe8a907782..46c14444f89 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLUnwrapExceptionInstrumentation.java +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/GraphQLUnwrapExceptionInstrumentation.java @@ -34,11 +34,6 @@ public void methodAdvice(MethodTransformer transformer) { this.getClass().getName() + "$UnwrapGetExceptionAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] {"datadog.trace.instrumentation.graphqljava.AsyncExceptionUnwrapper"}; - } - public static class UnwrapGetExceptionAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void onExit(@Advice.Return(readOnly = false) Throwable throwable) { diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyModule.java b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyModule.java index 320fb7d53c6..5b7215c17fa 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyModule.java +++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyModule.java @@ -18,20 +18,6 @@ public boolean defaultEnabled() { return false; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ExtractAdapter", - packageName + ".ExtractAdapter$Request", - packageName + ".ExtractAdapter$Response", - packageName + ".GrizzlyDecorator", - packageName + ".GrizzlyDecorator$GrizzlyBlockResponseFunction", - packageName + ".RequestURIDataAdapter", - packageName + ".SpanClosingListener", - packageName + ".GrizzlyBlockingHelper", - }; - } - @Override public List typeInstrumentations() { return singletonList(new GrizzlyHttpHandlerInstrumentation()); diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/GrizzlyClientModule.java b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/GrizzlyClientModule.java index e5e9b621094..3387a3094dc 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/GrizzlyClientModule.java +++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/GrizzlyClientModule.java @@ -20,15 +20,6 @@ protected boolean defaultEnabled() { return InstrumenterConfig.get().isIntegrationEnabled(Collections.singleton("mule"), false); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ClientDecorator", - packageName + ".InjectAdapter", - packageName + ".AsyncHandlerAdapter", - }; - } - @Override public List typeInstrumentations() { return singletonList(new AsyncHttpClientInstrumentation()); diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyBodyModule.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyBodyModule.java index 25f387fb867..7b2db63a7ab 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyBodyModule.java +++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyBodyModule.java @@ -14,11 +14,6 @@ public GrizzlyBodyModule() { super("grizzly"); } - @Override - public String[] helperClassNames() { - return new String[] {"datadog.trace.instrumentation.grizzlyhttp232.HttpHeaderFetchingHelper"}; - } - @Override public Map contextStore() { final Map ret = new HashMap<>(); diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyFilterChainModule.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyFilterChainModule.java index de2fac00b67..346edea14ea 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyFilterChainModule.java +++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyFilterChainModule.java @@ -14,19 +14,6 @@ public GrizzlyFilterChainModule() { super("grizzly-filterchain"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".GrizzlyDecorator", - packageName + ".GrizzlyDecorator$GrizzlyHttpBlockResponseFunction", - packageName + ".GrizzlyHttpBlockingHelper", - packageName + ".GrizzlyHttpBlockingHelper$CloseCompletionHandler", - packageName + ".GrizzlyHttpBlockingHelper$JustCompleteProcessor", - packageName + ".HTTPRequestPacketURIDataAdapter", - packageName + ".ExtractAdapter" - }; - } - @Override protected boolean defaultEnabled() { return InstrumenterConfig.get().isIntegrationEnabled(Collections.singleton("mule"), false); diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientModule.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientModule.java index 4322fa3d674..05c90685a9c 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientModule.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientModule.java @@ -18,15 +18,6 @@ public GrpcClientModule() { super("grpc", "grpc-client", "grpc-message"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".GrpcClientDecorator", - packageName + ".GrpcClientDecorator$1", - packageName + ".GrpcInjectAdapter" - }; - } - @Override public Map contextStore() { Map contextStores = new HashMap<>(); diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerModule.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerModule.java index b25894bb35d..cb68c9a9719 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerModule.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerModule.java @@ -18,18 +18,6 @@ public GrpcServerModule() { super("grpc", "grpc-server"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".GrpcServerDecorator", - packageName + ".GrpcServerDecorator$1", - packageName + ".GrpcExtractAdapter", - packageName + ".TracingServerInterceptor", - packageName + ".TracingServerInterceptor$TracingServerCall", - packageName + ".TracingServerInterceptor$TracingServerCallListener", - }; - } - @Override public Map contextStore() { return singletonMap("io.grpc.ServerBuilder", Boolean.class.getName()); diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/HazelcastLegacyModule.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/HazelcastLegacyModule.java index 863220cbe4b..08432142772 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/HazelcastLegacyModule.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/HazelcastLegacyModule.java @@ -23,16 +23,6 @@ protected boolean defaultEnabled() { return false; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HazelcastConstants", - packageName + ".DistributedObjectDecorator", - packageName + ".DistributedObjectDecorator$1", - packageName + ".SpanFinishingExecutionCallback" - }; - } - @Override public List typeInstrumentations() { return Arrays.asList( diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/HazelcastModule.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/HazelcastModule.java index 742ed3881d2..df520fde910 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/HazelcastModule.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/HazelcastModule.java @@ -28,15 +28,6 @@ protected boolean defaultEnabled() { return DEFAULT_ENABLED; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ClientInvocationDecorator", - packageName + ".SpanFinishingExecutionCallback", - packageName + ".HazelcastConstants" - }; - } - @Override public Map contextStore() { final Map stores = new HashMap<>(); diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteModule.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteModule.java index 69b71ab531f..6db08a3b597 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteModule.java +++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/IgniteModule.java @@ -33,16 +33,6 @@ public Map contextStore() { return Collections.singletonMap("org.apache.ignite.IgniteCache", "org.apache.ignite.Ignite"); } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.ignite.v2.cache.IgniteQueryInfo", - "datadog.trace.instrumentation.ignite.v2.cache.IgniteQueryInfo$1", - "datadog.trace.instrumentation.ignite.v2.cache.IgniteCacheDecorator", - "datadog.trace.instrumentation.ignite.v2.cache.SpanFinishingCallback", - }; - } - @Override public List typeInstrumentations() { return Arrays.asList( diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/datadog/trace/instrumentation/jackson_2/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/datadog/trace/instrumentation/jackson_2/core/JsonParserInstrumentation.java index a7dfff9762d..a33452289f7 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/datadog/trace/instrumentation/jackson_2/core/JsonParserInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/src/main/java/datadog/trace/instrumentation/jackson_2/core/JsonParserInstrumentation.java @@ -73,14 +73,6 @@ public Map contextStore() { return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext"); } - @Override - public String[] helperClassNames() { - return new String[] { - "com.fasterxml.jackson.core.json" + ".JsonParser2Helper", - "com.fasterxml.jackson.core.sym" + ".BytesToNameCanonicalizer2Helper", - }; - } - public static class NameAdvice { @Advice.OnMethodExit(suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/datadog/trace/instrumentation/jackson_2_12/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/datadog/trace/instrumentation/jackson_2_12/core/JsonParserInstrumentation.java index 6f207b58c4a..144633ccc19 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/datadog/trace/instrumentation/jackson_2_12/core/JsonParserInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/main/java/datadog/trace/instrumentation/jackson_2_12/core/JsonParserInstrumentation.java @@ -75,14 +75,6 @@ public Map contextStore() { return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext"); } - @Override - public String[] helperClassNames() { - return new String[] { - "com.fasterxml.jackson.core.json" + ".JsonParser212Helper", - "com.fasterxml.jackson.core.sym" + ".ByteQuadsCanonicalizer212Helper", - }; - } - public static class NameAdvice { @Advice.OnMethodExit(suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/datadog/trace/instrumentation/jackson_2_16/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/datadog/trace/instrumentation/jackson_2_16/core/JsonParserInstrumentation.java index 81624a1d64c..10286709fe3 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/datadog/trace/instrumentation/jackson_2_16/core/JsonParserInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/main/java/datadog/trace/instrumentation/jackson_2_16/core/JsonParserInstrumentation.java @@ -73,14 +73,6 @@ public Map contextStore() { return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext"); } - @Override - public String[] helperClassNames() { - return new String[] { - "com.fasterxml.jackson.core.json" + ".JsonParser216Helper", - "com.fasterxml.jackson.core.sym" + ".ByteQuadsCanonicalizer216Helper", - }; - } - public static class NameAdvice { @Advice.OnMethodExit(suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/datadog/trace/instrumentation/jackson_2_6/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/datadog/trace/instrumentation/jackson_2_6/core/JsonParserInstrumentation.java index 1f427d982ba..b2dc9d5915d 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/datadog/trace/instrumentation/jackson_2_6/core/JsonParserInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/main/java/datadog/trace/instrumentation/jackson_2_6/core/JsonParserInstrumentation.java @@ -75,14 +75,6 @@ public Map contextStore() { return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext"); } - @Override - public String[] helperClassNames() { - return new String[] { - "com.fasterxml.jackson.core.json" + ".JsonParser26Helper", - "com.fasterxml.jackson.core.sym" + ".ByteQuadsCanonicalizer26Helper", - }; - } - public static class NameAdvice { @Advice.OnMethodExit(suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/datadog/trace/instrumentation/jackson_2_8/core/JsonParserInstrumentation.java b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/datadog/trace/instrumentation/jackson_2_8/core/JsonParserInstrumentation.java index b0cb0043e27..da03ee6f986 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/datadog/trace/instrumentation/jackson_2_8/core/JsonParserInstrumentation.java +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/main/java/datadog/trace/instrumentation/jackson_2_8/core/JsonParserInstrumentation.java @@ -75,14 +75,6 @@ public Map contextStore() { return singletonMap(TARGET_TYPE, "datadog.trace.bootstrap.instrumentation.iast.NamedContext"); } - @Override - public String[] helperClassNames() { - return new String[] { - "com.fasterxml.jackson.core.json" + ".JsonParser28Helper", - "com.fasterxml.jackson.core.sym" + ".ByteQuadsCanonicalizer28Helper", - }; - } - public static class NameAdvice { @Advice.OnMethodExit(suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/InstrumenterInstrumentation.java b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/InstrumenterInstrumentation.java index 99f8e7d2fcd..a199e9698fe 100644 --- a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/InstrumenterInstrumentation.java +++ b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/InstrumenterInstrumentation.java @@ -33,13 +33,6 @@ public ElementMatcher hierarchyMatcher() { .and(nameEndsWith(".core.instr.Instrumenter")); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CoverageDataInjector", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/ProbeInserterInstrumentation.java b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/ProbeInserterInstrumentation.java index 695b659d6e1..e68efe1ec40 100644 --- a/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/ProbeInserterInstrumentation.java +++ b/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/ProbeInserterInstrumentation.java @@ -38,11 +38,6 @@ public boolean isEnabled() { return super.isEnabled() && Config.get().isCiVisibilityCoverageLinesEnabled(); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".MethodVisitorWrapper"}; - } - @SuppressForbidden @Override public ElementMatcher structureMatcher() { diff --git a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java index 6b724a8c24e..3064f508063 100644 --- a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java +++ b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java @@ -32,16 +32,6 @@ public String instrumentedType() { return "org.jboss.modules.Module"; } - @Override - public String[] helperClassNames() { - return new String[] { - "org.jboss.modules.ModuleLinkageHelper", - "org.jboss.modules.ModuleLinkageHelper$1", - "org.jboss.modules.ModuleLinkageHelper$2", - packageName + ".ModuleNameHelper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java index a19e2cd345d..cc95715c6df 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractConnectionInstrumentation.java @@ -30,13 +30,6 @@ public Map contextStore() { return singletonMap("java.sql.Statement", DBQueryInfo.class.getName()); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JDBCDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java index cc2dbcfc2ef..5a0391064bf 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java @@ -39,13 +39,6 @@ public AbstractPreparedStatementInstrumentation( super(instrumentationName, additionalNames); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JDBCDecorator", - }; - } - @Override public Map contextStore() { Map contextStore = new HashMap<>(4); diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java index 1565a1af0f5..efda9d4add7 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java @@ -77,13 +77,6 @@ public DBMCompatibleConnectionInstrumentation() { "test.TestConnection" }; - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JDBCDecorator", packageName + ".SQLCommenter", - }; - } - @Override public String[] knownMatchingTypes() { return CONCRETE_TYPES; diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java index 59291b453b4..43da1f03aa3 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java @@ -34,13 +34,6 @@ public boolean defaultEnabled() { return false; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".DataSourceDecorator", - }; - } - @Override public String hierarchyMarkerType() { return null; // bootstrap type diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java index 816d9b6f86d..79f2ccd05a5 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java @@ -36,11 +36,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".PoolWaitingDecorator"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2ManagedConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2ManagedConnectionInstrumentation.java index 25fa6e2d595..ba3941fa6d2 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2ManagedConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2ManagedConnectionInstrumentation.java @@ -30,11 +30,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".PoolWaitingDecorator"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PerUserPoolDataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PerUserPoolDataSourceInstrumentation.java index 44ac190c7d2..303336c68bc 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PerUserPoolDataSourceInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PerUserPoolDataSourceInstrumentation.java @@ -30,11 +30,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".PoolWaitingDecorator"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDataSourceInstrumentation.java index c19c35fb36f..53a929ff0b0 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDataSourceInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDataSourceInstrumentation.java @@ -30,11 +30,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".PoolWaitingDecorator"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDriverInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDriverInstrumentation.java index 08648a5947c..f74fa678570 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDriverInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDriverInstrumentation.java @@ -30,11 +30,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".PoolWaitingDecorator"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2SharedPoolDataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2SharedPoolDataSourceInstrumentation.java index 0ba8e5f5d80..15dc8a0dbae 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2SharedPoolDataSourceInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2SharedPoolDataSourceInstrumentation.java @@ -30,11 +30,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".PoolWaitingDecorator"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java index f593a8dc130..e499fdc7a8b 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DriverInstrumentation.java @@ -47,13 +47,6 @@ public Map contextStore() { return singletonMap("java.sql.Connection", JDBCConnectionContext.class.getName()); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JDBCDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagHandoffQueueInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagHandoffQueueInstrumentation.java index 61639d7cb5d..2865eef72dc 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagHandoffQueueInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagHandoffQueueInstrumentation.java @@ -42,13 +42,6 @@ public ElementMatcher structureMatcher() { return declaresField(named("handoffQueue")); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HikariBlockedTracker", packageName + ".HikariBlockedTrackingSynchronousQueue", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java index bc60aeb15cb..853865725ba 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java @@ -52,13 +52,6 @@ public String instrumentedType() { return "com.zaxxer.hikari.util.ConcurrentBag"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HikariBlockedTracker", packageName + ".PoolWaitingDecorator" - }; - } - @Override public Map contextStore() { // The contextStore Map is populated by HikariPoolInstrumentation diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariQueuedSequenceSynchronizerInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariQueuedSequenceSynchronizerInstrumentation.java index 7fd3f1c3ff0..dabadf28a3a 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariQueuedSequenceSynchronizerInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariQueuedSequenceSynchronizerInstrumentation.java @@ -25,13 +25,6 @@ public String instrumentedType() { return "com.zaxxer.hikari.util.QueuedSequenceSynchronizer"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HikariBlockedTracker", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java index edb245a6dcf..8f00550c721 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java @@ -60,13 +60,6 @@ public Map contextStore() { return singletonMap("java.sql.Connection", JDBCConnectionContext.class.getName()); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JDBCDecorator", packageName + ".SQLCommenter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java index 74d10559c10..640497d7a85 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java @@ -27,13 +27,6 @@ public JedisInstrumentation() { super("jedis", "redis"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JedisClientDecorator", - }; - } - @Override public String instrumentedType() { return "redis.clients.jedis.Connection"; diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/FormInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/FormInstrumentation.java index c128a194b77..dae3f03cf80 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/FormInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/FormInstrumentation.java @@ -41,13 +41,6 @@ public String[] knownMatchingTypes() { return new String[] {"jakarta.ws.rs.core.Form", "javax.ws.rs.core.Form"}; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JerseyTaintHelper", - }; - } - @RequiresRequestContext(RequestContextSlot.IAST) public static class AsMapAdvice { @Advice.OnMethodExit(suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java index 753b5af65a9..f3f021e5cc7 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/InboundMessageContextInstrumentation.java @@ -54,13 +54,6 @@ public String instrumentedType() { return "org.glassfish.jersey.message.internal.InboundMessageContext"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JerseyTaintHelper", - }; - } - /** This advice tries to skip tainting the headers before they are ready */ public static class SetHeadersAdvice { diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/UriRoutingContextInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/UriRoutingContextInstrumentation.java index 43d20243130..d26ebb85062 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/UriRoutingContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/UriRoutingContextInstrumentation.java @@ -45,13 +45,6 @@ public String instrumentedType() { return "org.glassfish.jersey.server.internal.routing.UriRoutingContext"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JerseyTaintHelper", - }; - } - @RequiresRequestContext(RequestContextSlot.IAST) public static class GetPathParametersAdvice { @Advice.OnMethodExit(suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartReaderServerSideInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartReaderServerSideInstrumentation.java index a1f6658b068..d53c9f81b75 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartReaderServerSideInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartReaderServerSideInstrumentation.java @@ -45,11 +45,6 @@ public String instrumentedType() { return "org.glassfish.jersey.media.multipart.internal.MultiPartReaderServerSide"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".MultiPartHelper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartReaderServerSideInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartReaderServerSideInstrumentation.java index 8dbbb6459ea..072e5637167 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartReaderServerSideInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartReaderServerSideInstrumentation.java @@ -45,11 +45,6 @@ public String instrumentedType() { return "org.glassfish.jersey.media.multipart.internal.MultiPartReaderServerSide"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".MultiPartHelper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/datadog/trace/instrumentation/connection_error/jersey/ClientRuntimeInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/datadog/trace/instrumentation/connection_error/jersey/ClientRuntimeInstrumentation.java index 96025bc3081..7aa1f32714f 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/datadog/trace/instrumentation/connection_error/jersey/ClientRuntimeInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/src/main/java/datadog/trace/instrumentation/connection_error/jersey/ClientRuntimeInstrumentation.java @@ -25,11 +25,6 @@ public String instrumentedType() { return "org.glassfish.jersey.client.ClientRuntime"; } - @Override - public String[] helperClassNames() { - return new String[] {"org.glassfish.jersey.client.WrappingResponseCallback"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestExtractContentParametersInstrumentation.java index 9660f7824a7..a8035c4ee68 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestExtractContentParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestExtractContentParametersInstrumentation.java @@ -44,11 +44,6 @@ public String instrumentedType() { return "org.eclipse.jetty.server.Request"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".MultipartHelper"}; - } - // Discriminates Jetty 11.0.x ([11.0, 12.0)): // - _contentParameters: MultiMap field exists in 11.x (excludes Jetty 12 where // org.eclipse.jetty.server.Request was removed) diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java index 96ec5ff528a..18c51fe344e 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java @@ -39,13 +39,6 @@ public String instrumentedType() { return "org.eclipse.jetty.server.Request"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".PartHelper", packageName + ".PartHelper$MpiGetPartsHolder" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java index dcfae4aca4c..69b9a4591a5 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java @@ -40,11 +40,6 @@ public String instrumentedType() { return "org.eclipse.jetty.server.Request"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".MultipartHelper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java index ed769a11d7c..09292b7611e 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java @@ -40,11 +40,6 @@ public String instrumentedType() { return "org.eclipse.jetty.server.Request"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".MultipartHelper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/RequestExtractContentParametersInstrumentation.java index d7c810a511b..6fd09a33cef 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/RequestExtractContentParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/RequestExtractContentParametersInstrumentation.java @@ -40,11 +40,6 @@ public String instrumentedType() { return "org.eclipse.jetty.server.Request"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".MultipartHelper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JavaxJmsModule.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JavaxJmsModule.java index 9c0ef70a12b..1bc43bb5657 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JavaxJmsModule.java +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JavaxJmsModule.java @@ -29,18 +29,6 @@ public String muzzleDirective() { return "javax.jms"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JMSDecorator", - packageName + ".MessageExtractAdapter", - packageName + ".MessageExtractAdapter$1", - packageName + ".MessageInjectAdapter", - packageName + ".DatadogMessageListener", - packageName + ".JMSLogger" - }; - } - @Override public Map contextStore() { Map contextStore = new HashMap<>(4); diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java index d8b98526804..9e42256114b 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java +++ b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java @@ -39,13 +39,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JSPDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java index 71918ce5332..b46a6b91feb 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java @@ -31,13 +31,6 @@ public String instrumentedType() { return "org.apache.jasper.JspCompilationContext"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JSPDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java index 840ea9cc196..8fdf749a5aa 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java @@ -67,17 +67,6 @@ public ElementMatcher hierarchyMatcher() { "org.powermock.modules.junit4.common.internal.PowerMockJUnitRunnerDelegate")))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TestEventsHandlerHolder", - packageName + ".SkippedByDatadog", - packageName + ".JUnit4Utils", - packageName + ".TracingListener", - packageName + ".JUnit4TracingListener", - }; - } - @Override public Map contextStore() { return Collections.singletonMap( diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java index c998f772275..c72a52a86c7 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java @@ -56,17 +56,6 @@ public ElementMatcher hierarchyMatcher() { return extendsClass(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - parentPackageName + ".SkippedByDatadog", - parentPackageName + ".JUnit4Utils", - parentPackageName + ".TracingListener", - parentPackageName + ".TestEventsHandlerHolder", - packageName + ".FailureSuppressingNotifier" - }; - } - @Override public Map contextStore() { return Collections.singletonMap( diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java index 89fb61c89f9..f80047673fd 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java @@ -30,13 +30,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JUnit4BeforeAfterOperationsTracer", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java index bacbafe3464..3019de1f927 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java @@ -44,18 +44,6 @@ public ElementMatcher hierarchyMatcher() { .and(not(named("org.junit.platform.suite.engine.SuiteTestEngine"))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JUnitPlatformUtils", - packageName + ".ExecutionRequestFactory", - packageName + ".TestDataFactory", - packageName + ".TestEventsHandlerHolder", - packageName + ".TracingListener", - packageName + ".CompositeEngineListener", - }; - } - @Override public Map contextStore() { return Collections.singletonMap("org.junit.platform.engine.TestDescriptor", "java.lang.Object"); diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java index d5ae04416dd..d2810e6b689 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java @@ -54,13 +54,6 @@ public ElementMatcher hierarchyMatcher() { .and(not(nameStartsWith("org.spockframework"))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JUnitPlatformUtils", packageName + ".TestEventsHandlerHolder", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java index 7fc86bdf1d5..b7b9bdcfb39 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java @@ -47,13 +47,6 @@ public ElementMatcher hierarchyMatcher() { .and(not(named("org.junit.platform.suite.engine.SuiteTestEngine"))); } - @Override - public String[] helperClassNames() { - return new String[] { - parentPackageName + ".JUnitPlatformUtils", parentPackageName + ".TestEventsHandlerHolder", - }; - } - @Override public Map contextStore() { return Collections.singletonMap( diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java index 9dec3950560..bc283e72294 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java @@ -30,13 +30,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BeforeAfterOperationsTracer", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java index 98fbb90d925..06079061e86 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java @@ -64,11 +64,6 @@ public Map contextStore() { return singletonMap(DESERIALIZER_CLASS, Boolean.class.getName()); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".KafkaIastHelper"}; - } - @Override public Reference[] additionalMuzzleReferences() { return MUZZLE_CHECK; diff --git a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/ConnectWorkerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/ConnectWorkerInstrumentation.java index 5c56e1341d0..088a9b62d4a 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/ConnectWorkerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/src/main/java/datadog/trace/instrumentation/kafka_connect/ConnectWorkerInstrumentation.java @@ -25,13 +25,6 @@ public ConnectWorkerInstrumentation() { super("kafka", "kafka-connect"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TaskListener", - }; - } - @Override public String hierarchyMarkerType() { return TARGET_TYPE; diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateExecutionInstrumentation.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateExecutionInstrumentation.java index 84f3feaff63..d3070ecdde2 100644 --- a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateExecutionInstrumentation.java @@ -42,16 +42,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".KarateUtils", - packageName + ".TestEventsHandlerHolder", - packageName + ".KarateTracingHook", - packageName + ".ExecutionContext" - }; - } - @Override public Map contextStore() { return Collections.singletonMap( diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java index bcc14ce5553..481e4602a0a 100644 --- a/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java +++ b/dd-java-agent/instrumentation/karate/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java @@ -27,15 +27,6 @@ public String instrumentedType() { return "com.intuit.karate.Runner$Builder"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".KarateUtils", - packageName + ".TestEventsHandlerHolder", - packageName + ".KarateTracingHook" - }; - } - @Override public Map contextStore() { return Collections.singletonMap("com.intuit.karate.core.FeatureRuntime", "java.lang.Boolean"); diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/KotlinCoroutinesModule.java b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/KotlinCoroutinesModule.java index bcb69cbe267..23d202ec40d 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/KotlinCoroutinesModule.java +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/KotlinCoroutinesModule.java @@ -12,13 +12,6 @@ public KotlinCoroutinesModule() { super("kotlin_coroutine"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".DatadogThreadContextElement", packageName + ".DatadogThreadContextElement$1" - }; - } - @Override public List typeInstrumentations() { return Arrays.asList( diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java index 5f102b9406c..3028ffa0e82 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java @@ -29,13 +29,6 @@ public Map contextStore() { "com.lambdaworks.redis.api.StatefulConnection", "com.lambdaworks.redis.RedisURI"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".LettuceClientDecorator", packageName + ".InstrumentationPoints" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java index 6cef3cd808d..c053eade633 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java @@ -22,13 +22,6 @@ public String instrumentedType() { return "com.lambdaworks.redis.RedisClient"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".LettuceClientDecorator", packageName + ".InstrumentationPoints" - }; - } - @Override public Map contextStore() { return Collections.singletonMap( diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java index c8771f73466..7c64531792f 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java @@ -29,15 +29,6 @@ public Map contextStore() { "io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".LettuceClientDecorator", - packageName + ".LettuceAsyncBiConsumer", - packageName + ".LettuceInstrumentationUtil" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java index 0fb1ddb9039..6da8529dc2c 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java @@ -33,16 +33,6 @@ public Map contextStore() { "io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".LettuceClientDecorator", - packageName + ".LettuceInstrumentationUtil", - packageName + ".LettuceAsyncBiConsumer", - packageName + ".ConnectionContextBiConsumer" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionProviderInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionProviderInstrumentation.java index cfa04bab42b..8aac3d3a22c 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionProviderInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/MasterReplicaConnectionProviderInstrumentation.java @@ -53,15 +53,6 @@ public Map contextStore() { "io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".LettuceClientDecorator", - packageName + ".MasterReplicaConnectionHelper", - packageName + ".LettuceInstrumentationUtil" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { // Intent argument types move across Lettuce versions, but only the returned connection is used. diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/PooledClusterConnectionProviderInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/PooledClusterConnectionProviderInstrumentation.java index d9920b27249..8844a516310 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/PooledClusterConnectionProviderInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/PooledClusterConnectionProviderInstrumentation.java @@ -46,15 +46,6 @@ public Map contextStore() { "io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".LettuceClientDecorator", - packageName + ".MasterReplicaConnectionHelper", - packageName + ".LettuceInstrumentationUtil" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/RedisClusterClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/RedisClusterClientInstrumentation.java index b4d72219af5..f5ad7e37ae7 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/RedisClusterClientInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/RedisClusterClientInstrumentation.java @@ -36,11 +36,6 @@ public Map contextStore() { "io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".ClusterConnectionContextFunction"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/GetPartsInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/GetPartsInstrumentation.java index 102c70acd98..5156f4cbceb 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/GetPartsInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/GetPartsInstrumentation.java @@ -39,11 +39,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] {"datadog.trace.instrumentation.liberty20.PartHelper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/HttpInboundServiceContextImplInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/HttpInboundServiceContextImplInstrumentation.java index e866c638f8b..52d222d5ef9 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/HttpInboundServiceContextImplInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/HttpInboundServiceContextImplInstrumentation.java @@ -52,14 +52,6 @@ public String instrumentedType() { return "com.ibm.ws.http.channel.internal.inbound.HttpInboundServiceContextImpl"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".LibertyBlockingHelper", - packageName + ".LibertyBlockingHelper$WsByteBufferImpl", - }; - } - /** * @see HttpInboundServiceContextImpl#sendResponseBody(WsByteBuffer[]) * @see HttpInboundServiceContextImpl#finishResponseMessage(WsByteBuffer[]) diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParseParametersInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParseParametersInstrumentation.java index dd920e9849b..877fc5e361e 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParseParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ParseParametersInstrumentation.java @@ -48,15 +48,6 @@ public String instrumentedType() { return "com.ibm.ws.webcontainer.srt.SRTServletRequest"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ParameterCollector", - packageName + ".ParameterCollector$ParameterCollectorNoop", - packageName + ".ParameterCollector$ParameterCollectorImpl", - }; - } - @Override public void typeAdvice(TypeTransformer transformer) { transformer.applyAdvice(new ParseParametersVisitorWrapper()); diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestFinishInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestFinishInstrumentation.java index a254cf8d92c..5721601b61b 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestFinishInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/RequestFinishInstrumentation.java @@ -25,18 +25,6 @@ public RequestFinishInstrumentation() { super("liberty"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HttpServletExtractAdapter", - packageName + ".HttpServletExtractAdapter$Request", - packageName + ".HttpServletExtractAdapter$Response", - packageName + ".LibertyDecorator", - packageName + ".LibertyDecorator$LibertyBlockResponseFunction", - packageName + ".RequestURIDataAdapter", - }; - } - @Override public String instrumentedType() { return "com.ibm.ws.webcontainer.srt.SRTServletRequest"; diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ResponseFinishInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ResponseFinishInstrumentation.java index 7debc6f3a31..cdb0cb18b54 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ResponseFinishInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ResponseFinishInstrumentation.java @@ -34,18 +34,6 @@ public ResponseFinishInstrumentation() { super("liberty"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HttpServletExtractAdapter", - packageName + ".HttpServletExtractAdapter$Request", - packageName + ".HttpServletExtractAdapter$Response", - packageName + ".LibertyDecorator", - packageName + ".LibertyDecorator$LibertyBlockResponseFunction", - packageName + ".RequestURIDataAdapter", - }; - } - @Override public String instrumentedType() { return "com.ibm.ws.webcontainer.srt.SRTServletResponse"; diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ThreadContextClassloaderInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ThreadContextClassloaderInstrumentation.java index 33f1641afb5..10f496f3bd3 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ThreadContextClassloaderInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/ThreadContextClassloaderInstrumentation.java @@ -24,13 +24,6 @@ public String instrumentedType() { return "com.ibm.ws.classloading.internal.ThreadContextClassLoader"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BundleNameHelper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/HttpInboundServiceContextImplInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/HttpInboundServiceContextImplInstrumentation.java index f9f3da82162..d3e0bf4ef9a 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/HttpInboundServiceContextImplInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/HttpInboundServiceContextImplInstrumentation.java @@ -52,14 +52,6 @@ public String instrumentedType() { return "com.ibm.ws.http.channel.internal.inbound.HttpInboundServiceContextImpl"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".LibertyBlockingHelper", - packageName + ".LibertyBlockingHelper$WsByteBufferImpl", - }; - } - /** * @see HttpInboundServiceContextImpl#sendResponseBody(WsByteBuffer[]) * @see HttpInboundServiceContextImpl#finishResponseMessage(WsByteBuffer[]) diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParseParametersInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParseParametersInstrumentation.java index d29c4fcdfb0..32226f503e8 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParseParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ParseParametersInstrumentation.java @@ -48,15 +48,6 @@ public String instrumentedType() { return "com.ibm.ws.webcontainer.srt.SRTServletRequest"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ParameterCollector", - packageName + ".ParameterCollector$ParameterCollectorNoop", - packageName + ".ParameterCollector$ParameterCollectorImpl", - }; - } - @Override public void typeAdvice(TypeTransformer transformer) { transformer.applyAdvice(new ParseParametersVisitorWrapper()); diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestFinishInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestFinishInstrumentation.java index 1e4aed9bd66..32e955e0197 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestFinishInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/RequestFinishInstrumentation.java @@ -25,18 +25,6 @@ public RequestFinishInstrumentation() { super("liberty"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HttpServletExtractAdapter", - packageName + ".HttpServletExtractAdapter$Request", - packageName + ".HttpServletExtractAdapter$Response", - packageName + ".LibertyDecorator", - packageName + ".LibertyDecorator$LibertyBlockResponseFunction", - packageName + ".RequestURIDataAdapter", - }; - } - @Override public String instrumentedType() { return "com.ibm.ws.webcontainer.srt.SRTServletRequest"; diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ResponseFinishInstrumentation.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ResponseFinishInstrumentation.java index 500d6ac9545..07876198ba6 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ResponseFinishInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/ResponseFinishInstrumentation.java @@ -34,18 +34,6 @@ public ResponseFinishInstrumentation() { super("liberty"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HttpServletExtractAdapter", - packageName + ".HttpServletExtractAdapter$Request", - packageName + ".HttpServletExtractAdapter$Response", - packageName + ".LibertyDecorator", - packageName + ".LibertyDecorator$LibertyBlockResponseFunction", - packageName + ".RequestURIDataAdapter", - }; - } - @Override public String instrumentedType() { return "com.ibm.ws.webcontainer.srt.SRTServletResponse"; diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java b/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java index 8cab6e5cc60..9ff173f256c 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java +++ b/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java @@ -42,11 +42,6 @@ public String instrumentedType() { return "org.apache.logging.log4j.core.config.LoggerConfig"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".DatadogAppender"}; - } - @Override public String muzzleDirective() { return "logs-intake"; diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java b/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java index 08cf804cede..43c12cff0a0 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java +++ b/dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java @@ -42,11 +42,6 @@ public String muzzleDirective() { return "default"; } - @Override - public String[] helperClassNames() { - return new String[] {"datadog.trace.instrumentation.log4j2.ThreadContextUpdater"}; - } - public static class ThreadContextAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void mdcClassInitialized() { diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/ContextDataInjectorFactoryInstrumentation.java b/dd-java-agent/instrumentation/log4j/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/ContextDataInjectorFactoryInstrumentation.java index fad0c7d62e2..8051db2bf3e 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/ContextDataInjectorFactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/log4j/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/ContextDataInjectorFactoryInstrumentation.java @@ -30,11 +30,6 @@ public String instrumentedType() { return "org.apache.logging.log4j.core.impl.ContextDataInjectorFactory"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".SpanDecoratingContextDataInjector"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java index a77604803ed..15c27d8200b 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java @@ -20,11 +20,6 @@ public String instrumentedType() { return "com.mongodb.internal.connection.BaseCluster"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".CallbackWrapper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java index dd32744dabe..610496f609f 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java @@ -20,11 +20,6 @@ public String instrumentedType() { return "com.mongodb.internal.connection.BaseCluster"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".CallbackWrapper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java index 2580d0c567c..7ccb11f3b32 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java @@ -20,11 +20,6 @@ public String instrumentedType() { return "com.mongodb.internal.connection.DefaultConnectionPool"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".CallbackWrapper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java index 3da72d9142c..07147ffbcf6 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java @@ -20,11 +20,6 @@ public String instrumentedType() { return "com.mongodb.internal.connection.DefaultConnectionPool"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".CallbackWrapper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java index b8aa8f0caaf..edb7065821b 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java @@ -22,11 +22,6 @@ public String instrumentedType() { return "com.mongodb.internal.connection.InternalStreamConnection"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".CallbackWrapper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java index bb6b46210ed..0bf4cdc9207 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java @@ -43,22 +43,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AttributeKeys", - packageName + ".client.NettyHttpClientDecorator", - packageName + ".server.ResponseExtractAdapter", - packageName + ".server.NettyHttpServerDecorator", - packageName + ".server.NettyHttpServerDecorator$NettyBlockResponseFunction", - packageName + ".server.BlockingResponseHandler", - packageName + ".server.BlockingResponseHandler$IgnoreAllWritesHandler", - packageName + ".server.HttpServerRequestTracingHandler", - packageName + ".server.HttpServerResponseTracingHandler", - packageName + ".server.HttpServerTracingHandler" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java index bf24223b4cb..4367c676554 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java @@ -64,34 +64,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AttributeKeys", - // client helpers - packageName + ".client.NettyHttpClientDecorator", - packageName + ".client.NettyResponseInjectAdapter", - packageName + ".client.HttpClientRequestTracingHandler", - packageName + ".client.HttpClientResponseTracingHandler", - packageName + ".client.HttpClientTracingHandler", - // server helpers - packageName + ".server.ResponseExtractAdapter", - packageName + ".server.NettyHttpServerDecorator", - packageName + ".server.NettyHttpServerDecorator$NettyBlockResponseFunction", - packageName + ".server.BlockingResponseHandler", - packageName + ".server.BlockingResponseHandler$IgnoreAllWritesHandler", - packageName + ".server.HttpServerContextTrackingHandler", - packageName + ".server.HttpServerRequestTracingHandler", - packageName + ".server.HttpServerResponseTracingHandler", - packageName + ".server.HttpServerTracingHandler", - packageName + ".server.MaybeBlockResponseHandler", - packageName + ".server.websocket.WebSocketServerTracingHandler", - packageName + ".server.websocket.WebSocketServerResponseTracingHandler", - packageName + ".server.websocket.WebSocketServerRequestTracingHandler", - packageName + ".NettyPipelineHelper" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvices( diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java index 60b98472c82..8b6cbef44ce 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java @@ -64,13 +64,6 @@ public Reference[] additionalMuzzleReferences() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".NettyMultipartHelper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java index 14d2b0faa57..077d6f4cd1b 100644 --- a/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java @@ -28,15 +28,6 @@ public String instrumentedType() { return "io.netty.util.concurrent.DefaultPromise"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ListenerWrapper", - packageName + ".ListenerWrapper$GenericWrapper", - packageName + ".ListenerWrapper$GenericProgressiveWrapper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecHttpEngineInstrumentation.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecHttpEngineInstrumentation.java index 8fd1e170686..9331a92b058 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecHttpEngineInstrumentation.java +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecHttpEngineInstrumentation.java @@ -28,13 +28,6 @@ public String instrumentedType() { return "com.squareup.okhttp.internal.http.HttpEngine"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AppSecInterceptor", - }; - } - @Override public void methodAdvice(final MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttp2Instrumentation.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttp2Instrumentation.java index d08f6c4c628..45936b3b7ee 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttp2Instrumentation.java +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/OkHttp2Instrumentation.java @@ -22,16 +22,6 @@ public String instrumentedType() { return "com.squareup.okhttp.OkHttpClient"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RequestBuilderInjectAdapter", - packageName + ".OkHttpClientDecorator", - packageName + ".TracingInterceptor", - packageName + ".AppSecInterceptor", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecHttpEngineInstrumentation.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecHttpEngineInstrumentation.java index 0b7aa00478f..6860939c44a 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecHttpEngineInstrumentation.java +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecHttpEngineInstrumentation.java @@ -28,13 +28,6 @@ public String instrumentedType() { return "okhttp3.internal.http.HttpEngine"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AppSecInterceptor", - }; - } - @Override public void methodAdvice(final MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java index 1745f02cc3b..a7d35eac36a 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java @@ -25,16 +25,6 @@ public String instrumentedType() { return "okhttp3.OkHttpClient"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RequestBuilderInjectAdapter", - packageName + ".OkHttpClientDecorator", - packageName + ".TracingInterceptor", - packageName + ".AppSecInterceptor", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OpenTelemetryInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OpenTelemetryInstrumentation.java index 223c6d76d84..610387b2b27 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OpenTelemetryInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OpenTelemetryInstrumentation.java @@ -30,25 +30,6 @@ public String instrumentedType() { return "io.opentelemetry.OpenTelemetry"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".OtelScope", - packageName + ".OtelSpan", - packageName + ".OtelSpan$1", // switch statement - packageName + ".OtelSpanContext", - packageName + ".OtelTracer", - packageName + ".OtelTracer$1", // switch statement - packageName + ".OtelTracerProvider", - packageName + ".OtelTracer$SpanBuilder", - packageName + ".OtelContextPropagators", - packageName + ".OtelContextPropagators$1", // switch statement - packageName + ".OtelContextPropagators$OtelHttpTextFormat", - packageName + ".OtelContextPropagators$OtelGetter", - packageName + ".TypeConverter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java index 0820e06b57d..3003d5448ae 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java @@ -54,36 +54,6 @@ public boolean onlyMatchKnownTypes() { return isShortcutMatchingEnabled(false); } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.opentelemetry.shim.context.OtelContext", - "datadog.opentelemetry.shim.context.OtelScope", - "datadog.opentelemetry.shim.context.propagation.AgentTextMapPropagator", - "datadog.opentelemetry.shim.context.propagation.OtelContextPropagators", - "datadog.opentelemetry.shim.context.propagation.TraceStateHelper", - "datadog.opentelemetry.shim.baggage.OtelBaggage", - "datadog.opentelemetry.shim.baggage.OtelBaggage$ValueOnly", - "datadog.opentelemetry.shim.baggage.OtelBaggageBuilder", - "datadog.opentelemetry.shim.trace.OtelExtractedContext", - "datadog.opentelemetry.shim.trace.OtelConventions", - "datadog.opentelemetry.shim.trace.OtelConventions$1", - "datadog.opentelemetry.shim.trace.OtelSpan", - "datadog.opentelemetry.shim.trace.OtelSpan$1", - "datadog.opentelemetry.shim.trace.OtelSpan$NoopSpan", - "datadog.opentelemetry.shim.trace.OtelSpan$NoopSpanContext", - "datadog.opentelemetry.shim.trace.OtelSpanBuilder", - "datadog.opentelemetry.shim.trace.OtelSpanBuilder$1", - "datadog.opentelemetry.shim.trace.OtelSpanContext", - "datadog.opentelemetry.shim.trace.OtelSpanEvent", - "datadog.opentelemetry.shim.trace.OtelSpanEvent$AttributesJsonParser", - "datadog.opentelemetry.shim.trace.OtelSpanLink", - "datadog.opentelemetry.shim.trace.OtelTracer", - "datadog.opentelemetry.shim.trace.OtelTracerBuilder", - "datadog.opentelemetry.shim.trace.OtelTracerProvider", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { // TracerProvider OpenTelemetry.getTracerProvider() diff --git a/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleReferenceInstrumentation.java b/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleReferenceInstrumentation.java index 583ed367801..ca5a881219f 100644 --- a/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleReferenceInstrumentation.java +++ b/dd-java-agent/instrumentation/osgi-4.3/src/main/java/datadog/trace/instrumentation/osgi43/BundleReferenceInstrumentation.java @@ -45,11 +45,6 @@ public ElementMatcher hierarchyMatcher() { .and(implementsInterface(named(hierarchyMarkerType()))); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".BundleWiringHelper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java index 55f78ffab6d..2d648ac3611 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java @@ -38,20 +38,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".DatadogWrapperHelper", - packageName + ".DatadogWrapperHelper$SwappedContextScope", - packageName + ".DatadogAsyncHandlerWrapper", - packageName + ".DatadogAsyncHandlerWrapper$1", - packageName + ".DatadogAsyncHandlerWrapper$2", - packageName + ".PekkoHttpServerHeaders", - packageName + ".PekkoHttpServerDecorator", - packageName + ".UriAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java index e37c329c7a2..912b6503137 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java @@ -61,23 +61,6 @@ public String instrumentedType() { return "org.apache.pekko.http.scaladsl.HttpExt"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".DatadogWrapperHelper", - packageName + ".DatadogWrapperHelper$SwappedContextScope", - packageName + ".DatadogServerRequestResponseFlowWrapper", - packageName + ".DatadogServerRequestResponseFlowWrapper$1", - packageName + ".DatadogServerRequestResponseFlowWrapper$1$1", - packageName + ".DatadogServerRequestResponseFlowWrapper$1$2", - packageName + ".DatadogServerRequestResponseFlowWrapper$1$3", - packageName + ".DatadogServerRequestResponseFlowWrapper$1$4", - packageName + ".PekkoHttpServerHeaders", - packageName + ".PekkoHttpServerDecorator", - packageName + ".UriAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieDirectivesInstrumentation.java index 77b2d1c8c67..58f2ea2decf 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/CookieDirectivesInstrumentation.java @@ -36,14 +36,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.TaintCookieFunction", - packageName + ".helpers.TaintOptionalCookieFunction", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { String traitName = "org.apache.pekko.http.scaladsl.server.directives.CookieDirectives"; diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ExtractDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ExtractDirectivesInstrumentation.java index 460553c08d8..f22c5c24eaf 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ExtractDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ExtractDirectivesInstrumentation.java @@ -47,15 +47,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.TaintUriFunction", - packageName + ".helpers.TaintRequestFunction", - packageName + ".helpers.TaintRequestContextFunction", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { instrumentDirective(transformer, "extractUri", "TaintUriDirectiveAdvice"); diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesInstrumentation.java index 6940bfa918a..37245674001 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/FormFieldDirectivesInstrumentation.java @@ -46,17 +46,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.ScalaToJava", - packageName + ".helpers.TaintMultiMapFunction", - packageName + ".helpers.TaintMapFunction", - packageName + ".helpers.TaintSeqFunction", - packageName + ".helpers.TaintSingleParameterFunction", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { // the Java API delegates to the Scala API diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MarshallingDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MarshallingDirectivesInstrumentation.java index e50e16b3bce..79f48df4b2a 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MarshallingDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/MarshallingDirectivesInstrumentation.java @@ -42,13 +42,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.TaintUnmarshaller", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesImplInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesImplInstrumentation.java index 97008705072..d0416a2c038 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesImplInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesImplInstrumentation.java @@ -31,13 +31,6 @@ public String instrumentedType() { return "org.apache.pekko.http.scaladsl.server.directives.ParameterDirectives$Impl$"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.TaintParametersFunction", - }; - } - @Override public Reference[] additionalMuzzleReferences() { // just so we can use assertInverse in the muzzle directive diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesInstrumentation.java index ab4b1e3a18b..ab5e213cf5e 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/ParameterDirectivesInstrumentation.java @@ -45,17 +45,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.ScalaToJava", - packageName + ".helpers.TaintMultiMapFunction", - packageName + ".helpers.TaintMapFunction", - packageName + ".helpers.TaintSeqFunction", - packageName + ".helpers.TaintSingleParameterFunction", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { // the Java API delegates to the Scala API diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UnmarshallerInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UnmarshallerInstrumentation.java index c1ea5e51810..a0ff0cad720 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UnmarshallerInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/iast/UnmarshallerInstrumentation.java @@ -44,13 +44,6 @@ public String hierarchyMarkerType() { return "org.apache.pekko.http.scaladsl.unmarshalling.Unmarshaller"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".helpers.TaintFutureHelper", - }; - } - @Override public ElementMatcher hierarchyMatcher() { return nameStartsWith("org.apache.pekko.http.scaladsl.unmarshalling.") diff --git a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java index 6e9ac44537b..35e1974ceb3 100644 --- a/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-2.6/src/main/java/datadog/trace/instrumentation/play26/SaveRawRemoteConnectionInstrumentation.java @@ -25,11 +25,6 @@ public String muzzleDirective() { return "play26Plus"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".RemoteConnectionWithRawAddress"}; - } - @Override public String instrumentedType() { return "play.core.server.common.ForwardedHeaderHandler"; diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java index 27ec208ced6..2884a2d1739 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/DelegatingBodyParserInstrumentation.java @@ -27,13 +27,6 @@ public Reference[] additionalMuzzleReferences() { return MuzzleReferences.PLAY_25_ONLY; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JavaMultipartFormDataRegisterExcF", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java index 7f678338970..409098c0cc1 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/FormUrlEncodedInstrumentation.java @@ -28,13 +28,6 @@ public String instrumentedType() { return "play.mvc.BodyParser$FormUrlEncoded"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BodyParserHelpers", packageName + ".BodyParserHelpers$ScalaIteratorAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java index 2b4b8ee09af..a2479148405 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/PlayBodyParsersInstrumentation.java @@ -35,13 +35,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BodyParserHelpers", packageName + ".BodyParserHelpers$ScalaIteratorAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java index bec92b9145c..4352637f986 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/ResultsStatusInstrumentation.java @@ -25,13 +25,6 @@ public String instrumentedType() { return "play.api.mvc.Results$Status"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BodyParserHelpers", packageName + ".BodyParserHelpers$ScalaIteratorAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice(named("apply"), packageName + ".ResultsStatusApplyAdvice"); diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java index 183bd2b6a4c..3e62e242e6f 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantJsonInstrumentation.java @@ -32,13 +32,6 @@ public String instrumentedType() { return "play.mvc.BodyParser$TolerantJson"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BodyParserHelpers", packageName + ".BodyParserHelpers$ScalaIteratorAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java index f4729728264..9581908d236 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/src/main/java/datadog/trace/instrumentation/play25/appsec/TolerantTextInstrumentation.java @@ -27,13 +27,6 @@ public String instrumentedType() { return "play.mvc.BodyParser$TolerantText"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BodyParserHelpers", packageName + ".BodyParserHelpers$ScalaIteratorAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java index 5eef4e9d065..023af91882f 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/DelegatingBodyParserInstrumentation.java @@ -40,13 +40,6 @@ public String instrumentedType() { return "play.mvc.BodyParser$DelegatingBodyParser"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JavaMultipartFormDataRegisterExcF", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java index c24225f9c75..3103e58a091 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/FormUrlEncodedInstrumentation.java @@ -34,13 +34,6 @@ public String instrumentedType() { return "play.mvc.BodyParser$FormUrlEncoded"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BodyParserHelpers", packageName + ".BodyParserHelpers$ScalaIteratorAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java index 2fbfdc02810..e04d0793c8d 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/PlayBodyParsersInstrumentation.java @@ -42,13 +42,6 @@ public String[] knownMatchingTypes() { return new String[] {TRAIT_NAME, TRAIT_NAME + "$class"}; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BodyParserHelpers", packageName + ".BodyParserHelpers$ScalaIteratorAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ResultsStatusInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ResultsStatusInstrumentation.java index 659a47a02bf..d7e3db81b03 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ResultsStatusInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/ResultsStatusInstrumentation.java @@ -45,13 +45,6 @@ public String instrumentedType() { return "play.api.mvc.Results$Status"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BodyParserHelpers", packageName + ".BodyParserHelpers$ScalaIteratorAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java index d76e9aede90..384ffda6423 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantJsonInstrumentation.java @@ -43,13 +43,6 @@ public String instrumentedType() { return "play.mvc.BodyParser$TolerantJson"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BodyParserHelpers", packageName + ".BodyParserHelpers$ScalaIteratorAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java index 8672cb509f8..ccb5510ac94 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantTextInstrumentation.java @@ -40,13 +40,6 @@ public String instrumentedType() { return "play.mvc.BodyParser$TolerantText"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BodyParserHelpers", packageName + ".BodyParserHelpers$ScalaIteratorAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java index d834c4bb04e..0dfaddea35e 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java +++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/TolerantXmlInstrumentation.java @@ -40,13 +40,6 @@ public String instrumentedType() { return "play.mvc.BodyParser$TolerantXml"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BodyParserHelpers", packageName + ".BodyParserHelpers$ScalaIteratorAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java b/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java index 7ea735da6e0..3757be3a85d 100644 --- a/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java +++ b/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java @@ -49,11 +49,6 @@ public void methodAdvice(MethodTransformer transformer) { QuartzSchedulingInstrumentation.class.getName() + "$QuartzSchedulingAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".QuartzDecorator"}; - } - public static class QuartzSchedulingAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static ContextScope enter(@Advice.Argument(0) JobExecutionContext context) { diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java index eddf53c1241..a774612a98d 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java @@ -75,15 +75,6 @@ public ElementMatcher hierarchyMatcher() { .and(not(extendsClass(named("reactor.rabbitmq.ChannelProxy")))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RabbitDecorator", - packageName + ".TextMapInjectAdapter", - packageName + ".TracedDelegatingConsumer", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { // We want the advice applied in a specific order. diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java index 527fc391f0f..e4a3d097502 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java @@ -37,15 +37,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RabbitDecorator", - // These are only used by muzzleCheck: - packageName + ".TracedDelegatingConsumer" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContinuationInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContinuationInstrumentation.java index 834b184d075..3291cd261d4 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContinuationInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContinuationInstrumentation.java @@ -34,13 +34,6 @@ public ElementMatcher hierarchyMatcher() { return nameStartsWith("ratpack.exec.").and(implementsInterface(named(hierarchyMarkerType()))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BlockWrapper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/DefaultExecutionInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/DefaultExecutionInstrumentation.java index 5dd2c43c5b3..61028c9a653 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/DefaultExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/DefaultExecutionInstrumentation.java @@ -28,13 +28,6 @@ public String instrumentedType() { return "ratpack.exec.internal.DefaultExecution"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ActionWrapper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerInstrumentation.java index e712e5e0601..f1631b72e1f 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/PathHandlerInstrumentation.java @@ -23,13 +23,6 @@ public String instrumentedType() { return "ratpack.path.internal.PathHandler"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".PathBindingPublishingHandler", packageName + ".TokenPathBinderInspector", - }; - } - private static final Reference TOKEN_PATH_BINDER_TOKEN_NAMES = new Reference.Builder("ratpack.path.internal.TokenPathBinder") .withField( diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyInstrumentation.java index f967f88c211..8ed4dbbf686 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackRequestBodyInstrumentation.java @@ -23,15 +23,6 @@ public String instrumentedType() { return "ratpack.server.internal.RequestBody"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RequestBodyCollectionPublisher$ByteBufIntoByteBufferCallback", - packageName + ".RequestBodyCollectionPublisher", - packageName + ".RequestBodyCollectionPublisher$1", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackTypedDataInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackTypedDataInstrumentation.java index 62f24396759..17bfbfa2a66 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackTypedDataInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/RatpackTypedDataInstrumentation.java @@ -29,13 +29,6 @@ public Map contextStore() { "ratpack.http.internal.ByteBufBackedTypedData", Boolean.class.getName()); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".GetTextCharSequenceSupplier", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java index 94c18f90a93..28a02619416 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerErrorHandlerInstrumentation.java @@ -29,13 +29,6 @@ public ElementMatcher hierarchyMatcher() { return concreteClass().and(implementsInterface(named(hierarchyMarkerType()))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RatpackServerDecorator", packageName + ".RequestURIAdapterAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryInstrumentation.java index c1963c57e5a..89a10f2fd60 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ServerRegistryInstrumentation.java @@ -21,15 +21,6 @@ public String instrumentedType() { return "ratpack.server.internal.ServerRegistry"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RatpackServerDecorator", - packageName + ".RequestURIAdapterAdapter", - packageName + ".TracingHandler", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RedisClientActorInstrumentation.java b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RedisClientActorInstrumentation.java index f68119922c6..68df431c2a7 100644 --- a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RedisClientActorInstrumentation.java +++ b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RedisClientActorInstrumentation.java @@ -33,11 +33,6 @@ public ElementMatcher hierarchyMatcher() { return extendsClass(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".RedisConnectionInfo"}; - } - @Override public Map contextStore() { return Collections.singletonMap("akka.actor.ActorRef", packageName + ".RedisConnectionInfo"); diff --git a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java index 8ca0e477e9d..6ec53badf47 100644 --- a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java +++ b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java @@ -56,15 +56,6 @@ public ElementMatcher hierarchyMatcher() { "redis.RoundRobinPoolRequest"))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".OnCompleteHandler", - packageName + ".RediscalaClientDecorator", - packageName + ".RedisConnectionInfo" - }; - } - @Override public Map contextStore() { return Collections.singletonMap("akka.actor.ActorRef", packageName + ".RedisConnectionInfo"); diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java index c166fb19c64..700b1c7896e 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java @@ -33,13 +33,6 @@ public String instrumentedType() { return "org.redisson.client.RedisConnection"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RedissonClientDecorator", packageName + ".SpanFinishListener", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java index 3d6b8ab8354..a512bb6f8cb 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java @@ -33,13 +33,6 @@ public String instrumentedType() { return "org.redisson.client.RedisConnection"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RedissonClientDecorator", packageName + ".SpanFinishListener", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java index 85e5f4aaa6e..cdec096dcaf 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java @@ -34,15 +34,6 @@ public String instrumentedType() { return "org.redisson.client.RedisConnection"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RedissonClientDecorator", - packageName + ".SpanFinishListener", - packageName + ".PromiseHelper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jModule.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jModule.java index c11c7b7f464..b50a53fd4fd 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jModule.java +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/Resilience4jModule.java @@ -13,29 +13,6 @@ public Resilience4jModule() { super("resilience4j"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".WrapperWithContext", - packageName + ".WrapperWithContext$CallableWithContext", - packageName + ".WrapperWithContext$CheckedRunnableWithContext", - packageName + ".WrapperWithContext$RunnableWithContext", - packageName + ".WrapperWithContext$CheckedFunctionWithContext", - packageName + ".WrapperWithContext$ConsumerWithContext", - packageName + ".WrapperWithContext$CheckedSupplierWithContext", - packageName + ".WrapperWithContext$CheckedConsumerWithContext", - packageName + ".WrapperWithContext$FunctionWithContext", - packageName + ".WrapperWithContext$SupplierOfCompletionStageWithContext", - packageName + ".WrapperWithContext$SupplierWithContext", - packageName + ".WrapperWithContext$SupplierOfFutureWithContext", - packageName + ".WrapperWithContext$FinishOnGetFuture", - packageName + ".Resilience4jSpanDecorator", - packageName + ".Resilience4jSpan", - packageName + ".CircuitBreakerDecorator", - packageName + ".RetryDecorator", - }; - } - @Override public List typeInstrumentations() { return Arrays.asList( diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java index c07a2c1e171..126018a04ed 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/src/main/java/datadog/trace/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java @@ -32,13 +32,6 @@ public String instrumentedType() { return "org.jboss.resteasy.client.jaxrs.internal.ClientInvocation"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".WrappedFuture", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartFormDataReaderInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartFormDataReaderInstrumentation.java index 6e5d5542cbc..c280c9121af 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartFormDataReaderInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartFormDataReaderInstrumentation.java @@ -40,11 +40,6 @@ public String instrumentedType() { return "org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataReader"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".MultipartHelper"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java index 809e1069ddb..acf91cd081c 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java +++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java @@ -50,13 +50,6 @@ public void methodAdvice(MethodTransformer transformer) { getClass().getName() + "$ResourceHandleAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ResourceDecorator", - }; - } - public static class ResourceHandleAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static ContextScope beginRequest( diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java index db2eb8c2fa5..deb86bbc843 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java +++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java @@ -44,17 +44,6 @@ public void methodAdvice(MethodTransformer transformer) { getClass().getName() + "$RestletHandleAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RestletExtractAdapter", - packageName + ".RestletExtractAdapter$Request", - packageName + ".RestletExtractAdapter$Response", - packageName + ".RestletDecorator", - packageName + ".HttpExchangeURIDataAdapter" - }; - } - @AppliesOn(CONTEXT_TRACKING) public static class ContextTrackingAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricInstrumentation.java b/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricInstrumentation.java index d58de1dc64b..afe9d717cc9 100644 --- a/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricInstrumentation.java +++ b/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricInstrumentation.java @@ -35,11 +35,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".RobolectricTestAnnotator"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java index c0c2ec9031c..59a5aa4019e 100644 --- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java @@ -75,13 +75,6 @@ public ElementMatcher hierarchyMatcher() { .or(declaresMethod(isAnnotatedWith(named(hierarchyMarkerType()))))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JakartaRsAnnotationsDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAsyncResponseInstrumentation.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAsyncResponseInstrumentation.java index 1ae11e76090..6fd916ec5c2 100644 --- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAsyncResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAsyncResponseInstrumentation.java @@ -43,13 +43,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JakartaRsAnnotationsDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java index 22f54fb0f03..64bd2bbb91b 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java @@ -73,13 +73,6 @@ public ElementMatcher hierarchyMatcher() { .or(declaresMethod(isAnnotatedWith(named(hierarchyMarkerType()))))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JaxRsAnnotationsDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java index 4f7605a508e..f9aa7965244 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java @@ -83,13 +83,6 @@ public ElementMatcher hierarchyMatcher() { .or(declaresMethod(isAnnotatedWith(named(hierarchyMarkerType()))))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JaxRsAnnotationsDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java index 9972a720d8c..55fb401a8db 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAsyncResponseInstrumentation.java @@ -43,13 +43,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JaxRsAnnotationsDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java index 6d62a70b43c..578cb1930a1 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java @@ -47,13 +47,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JaxRsClientV1Decorator", packageName + ".InjectAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvices( diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java index bf0de6b5c6f..86a527253db 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java @@ -32,16 +32,6 @@ public ElementMatcher hierarchyMatcher() { return extendsClass(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JaxRsClientDecorator", - packageName + ".ClientTracingFeature", - packageName + ".ClientTracingFilter", - packageName + ".InjectAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestInstrumentation.java b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestInstrumentation.java index 42e36d8f17b..d26facf3c41 100644 --- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestInstrumentation.java +++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestInstrumentation.java @@ -27,16 +27,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".execution.SuppressedTestFailedException", - packageName + ".ScalatestUtils", - packageName + ".RunContext", - packageName + ".DatadogReporter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumInstrumentation.java b/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumInstrumentation.java index eea1396519c..d1032684976 100644 --- a/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumInstrumentation.java +++ b/dd-java-agent/instrumentation/selenium-3.13/src/main/java/datadog/trace/instrumentation/selenium/SeleniumInstrumentation.java @@ -35,13 +35,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SeleniumUtils", packageName + ".SeleniumTestListener", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/CapturedContextProvidersInstrumentation.java b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/CapturedContextProvidersInstrumentation.java index 28953cf118f..4b79a444fb8 100644 --- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/CapturedContextProvidersInstrumentation.java +++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/CapturedContextProvidersInstrumentation.java @@ -39,12 +39,4 @@ public static void exit(@Advice.Return(readOnly = false) java.util.List loadedPr loadedProviders = providers; } } - - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".DatadogCapturedContextProvider", - packageName + ".DatadogCapturedContextProvider$WithDatadogCapturedContext", - }; - } } diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java index f9c1e49c30d..e5f7d4ce418 100644 --- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java @@ -42,15 +42,6 @@ public String hierarchyMarkerType() { return "jakarta.servlet.http.HttpServlet"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RumHttpServletRequestWrapper", - packageName + ".RumHttpServletResponseWrapper", - packageName + ".WrappedServletOutputStream", - }; - } - @Override public ElementMatcher hierarchyMatcher() { return hasSuperType(named(hierarchyMarkerType())) diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java index 88b2ce98782..ff4a5ac7ae2 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java @@ -56,15 +56,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.servlet.ServletRequestSetter", - "datadog.trace.instrumentation.servlet.SpanNameCache", - packageName + ".RequestDispatcherDecorator", - }; - } - @Override public Map contextStore() { return singletonMap("javax.servlet.RequestDispatcher", String.class.getName()); diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java index e8e2d863039..84c758e4f1d 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java @@ -44,13 +44,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".FilterDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java index 2a378ee33cb..b7351aa786b 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java @@ -56,11 +56,6 @@ public ElementMatcher hierarchyMatcher() { .and(not(extendsClass(WRAPPER_CLASS))); } - @Override - public String[] helperClassNames() { - return new String[] {"datadog.trace.agent.tooling.iast.TaintableEnumeration"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/snakeyaml-1.33/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumentation.java b/dd-java-agent/instrumentation/snakeyaml-1.33/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumentation.java index 83c43bf92bb..3a081f463e4 100644 --- a/dd-java-agent/instrumentation/snakeyaml-1.33/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumentation.java +++ b/dd-java-agent/instrumentation/snakeyaml-1.33/src/main/java/datadog/trace/instrumentation/snakeyaml/SnakeYamlInstrumentation.java @@ -42,13 +42,6 @@ public ElementMatcher.Junction classLoaderMatcher() { return NOT_SNAKEYAML_2; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SnakeYamlHelper", - }; - } - @Override public String instrumentedType() { return "org.yaml.snakeyaml.Yaml"; diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcModule.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcModule.java index ca895c910ef..1afcba1c677 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcModule.java +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/SofaRpcModule.java @@ -14,17 +14,6 @@ public SofaRpcModule() { super("sofarpc"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SofaRpcClientDecorator", - packageName + ".SofaRpcServerDecorator", - packageName + ".SofaRpcInjectAdapter", - packageName + ".SofaRpcExtractAdapter", - packageName + ".SofaRpcProtocolContext", - }; - } - @Override public List typeInstrumentations() { return asList( diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherInstrumentation.java index 96f0494b7c1..71d7089298d 100644 --- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherInstrumentation.java +++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkLauncherInstrumentation.java @@ -29,15 +29,6 @@ public String instrumentedType() { return "org.apache.spark.launcher.SparkLauncher"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".EmrUtils", - packageName + ".SparkConfAllowList", - packageName + ".SparkLauncherListener", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java index b06228b9d37..8eb096f5e09 100644 --- a/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java @@ -35,13 +35,6 @@ public String instrumentedType() { return "org.apache.spark.executor.Executor$TaskRunner"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SparkExecutorDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-beans-3.1/src/main/java/datadog/trace/instrumentation/springbeans/BeanFactoryInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-beans-3.1/src/main/java/datadog/trace/instrumentation/springbeans/BeanFactoryInstrumentation.java index 07f708e78e1..c56335d2124 100644 --- a/dd-java-agent/instrumentation/spring/spring-beans-3.1/src/main/java/datadog/trace/instrumentation/springbeans/BeanFactoryInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-beans-3.1/src/main/java/datadog/trace/instrumentation/springbeans/BeanFactoryInstrumentation.java @@ -42,11 +42,6 @@ public ElementMatcher hierarchyMatcher() { return extendsClass(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".BeanDefinitionRepairer"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringApplicationInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringApplicationInstrumentation.java index fd765599591..19a58513c05 100644 --- a/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringApplicationInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringApplicationInstrumentation.java @@ -29,13 +29,6 @@ public String instrumentedType() { return "org.springframework.boot.SpringApplicationRunListeners"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".DeploymentHelper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringServletInitializerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringServletInitializerInstrumentation.java index 5dad5aeda34..1930a72f02b 100644 --- a/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringServletInitializerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-boot-1.3/src/main/java/datadog/trace/instrumentation/springboot/SpringServletInitializerInstrumentation.java @@ -20,13 +20,6 @@ public SpringServletInitializerInstrumentation() { super("spring-boot"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".DeploymentHelper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulProxyRequestHelperInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulProxyRequestHelperInstrumentation.java index e1ee077cb52..9ebaf74a835 100644 --- a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulProxyRequestHelperInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/src/main/java/datadog/trace/instrumentation/springcloudzuul2/ZuulProxyRequestHelperInstrumentation.java @@ -32,11 +32,6 @@ public void methodAdvice(MethodTransformer transformer) { ZuulProxyRequestHelperInstrumentation.class.getName() + "$ProxyRequestHelperAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".HeaderUtils"}; - } - /** * The purpose of this instrumentation is to prevent the overwriting of instrumented headers when * a request is passed through a Zuul proxy. This instrumentation will ensure that the proxy's diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java index a42e4bfdfd6..f93309d9dd7 100644 --- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java @@ -50,15 +50,6 @@ public void methodAdvice(MethodTransformer transformer) { SpringMessageHandlerInstrumentation.class.getName() + "$HandleMessageAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SpringMessageDecorator", - packageName + ".SpringMessageExtractAdapter", - packageName + ".SpringMessageExtractAdapter$1", - }; - } - @AppliesOn(CONTEXT_TRACKING) public static class ContextPropagationAdvice { diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java index 42c3f674506..debe2785adc 100644 --- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java @@ -39,11 +39,6 @@ public String instrumentedType() { return "org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".RabbitListenerDecorator"}; - } - @Override public Map contextStore() { return singletonMap("org.springframework.amqp.core.Message", State.class.getName()); diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncInstrumentation.java index ad0c2dde831..1534708d0f9 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringAsyncInstrumentation.java @@ -21,13 +21,6 @@ public String instrumentedType() { return "org.springframework.aop.interceptor.AsyncExecutionInterceptor"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SpannedMethodInvocation", packageName + ".SpringSchedulingDecorator" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java index 71bdee1e59a..388a412256b 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java @@ -27,16 +27,6 @@ public String instrumentedType() { return "org.springframework.scheduling.config.Task"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SpringSchedulingDecorator", - packageName + ".SpringSchedulingRunnableWrapper", - packageName + ".SpringSchedulingRunnableWrapper$SchedulingAware", - packageName + ".SpringSchedulingRunnableWrapper$1", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/AuthenticationManagerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/AuthenticationManagerInstrumentation.java index 29fc6607b3a..5bcdfe4a549 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/AuthenticationManagerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/AuthenticationManagerInstrumentation.java @@ -35,13 +35,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.springsecurity5.SpringSecurityUserEventDecorator" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/SecurityContextHolderInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/SecurityContextHolderInstrumentation.java index 64d4718d5b6..d05b0f1bbb7 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/SecurityContextHolderInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/SecurityContextHolderInstrumentation.java @@ -35,14 +35,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.springsecurity5.SpringSecurityUserEventDecorator", - "datadog.trace.instrumentation.springsecurity5.AppSecDeferredContext" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UserDetailsManagerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UserDetailsManagerInstrumentation.java index ad1dfe06454..587ae741f5e 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UserDetailsManagerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UserDetailsManagerInstrumentation.java @@ -33,13 +33,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.springsecurity5.SpringSecurityUserEventDecorator" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java index 38191e0c06f..4849afdfa1a 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/main/java/datadog/trace/instrumentation/springsecurity5/UsernameNotFoundExceptionInstrumentation.java @@ -31,13 +31,6 @@ public ElementMatcher hierarchyMatcher() { return extendsClass(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.springsecurity5.SpringSecurityUserEventDecorator" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java index 381d454aed4..4f425e6d0c6 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java @@ -17,17 +17,6 @@ public WebClientFilterInstrumentation() { super("spring-webflux", "spring-webflux-client"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SpringWebfluxHttpClientDecorator", - packageName + ".StatusCodes", - packageName + ".TraceWebClientSubscriber", - packageName + ".WebClientTracingFilter", - packageName + ".WebClientTracingFilter$MonoWebClientTrace", - }; - } - @Override public String instrumentedType() { return "org.springframework.web.reactive.function.client.DefaultWebClientBuilder"; diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Json2TokenizerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Json2TokenizerInstrumentation.java index 6f98f2cd8c9..26c347d6c86 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Json2TokenizerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/Json2TokenizerInstrumentation.java @@ -30,13 +30,6 @@ public String instrumentedType() { return "org.springframework.http.codec.json.Jackson2Tokenizer"; } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.springwebflux.server.iast.TaintFluxElementsFunction" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerHttpRequestInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerHttpRequestInstrumentation.java index aa6b7a7084b..4a4f4c7683a 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerHttpRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/iast/ServerHttpRequestInstrumentation.java @@ -32,11 +32,6 @@ public ElementMatcher hierarchyMatcher() { return nameEndsWith("ServerHttpRequest").and(implementsInterface(named(hierarchyMarkerType()))); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".TaintFluxElementsFunction"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletInstrumentation.java index 66db1e0d905..b85b3273068 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletInstrumentation.java @@ -47,11 +47,6 @@ public String muzzleDirective() { return "spring-mvc-pre-5.3"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".RequestMappingInfoIterator"}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java index 8909bf7ebda..f44826ca76c 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/DispatcherServletInstrumentation.java @@ -38,16 +38,6 @@ public String instrumentedType() { return "org.springframework.web.servlet.DispatcherServlet"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SpringWebHttpServerDecorator", - packageName + ".ServletRequestURIAdapter", - packageName + ".HandlerMappingResourceNameFilter", - packageName + ".PathMatchingHttpServletRequestWrapper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java index 216f748fa8e..d5514b54801 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java @@ -46,13 +46,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SpringWebHttpServerDecorator", packageName + ".ServletRequestURIAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/InvocableHandlerMethodInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/InvocableHandlerMethodInstrumentation.java index 989f4841be5..e11cf325324 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/InvocableHandlerMethodInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/InvocableHandlerMethodInstrumentation.java @@ -34,13 +34,6 @@ public void methodAdvice(MethodTransformer transformer) { named("invokeForRequest"), getClass().getName() + "$WrapContinuableResultAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SpringWebHttpServerDecorator", packageName + ".ServletRequestURIAdapter", - }; - } - public static class WrapContinuableResultAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void after( diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java index e82b9b55366..3e8c560714e 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/TemplateAndMatrixVariablesInstrumentation.java @@ -79,13 +79,6 @@ public void methodAdvice(MethodTransformer transformer) { TemplateAndMatrixVariablesInstrumentation.class.getName() + "$HandleMatchAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".PairList", - }; - } - @Override public Advice.PostProcessor.Factory postProcessor() { return postProcessorFactory; diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/WebApplicationContextInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/WebApplicationContextInstrumentation.java index 408f4cb72fb..8a01b238a3d 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/WebApplicationContextInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/WebApplicationContextInstrumentation.java @@ -37,17 +37,6 @@ public ElementMatcher hierarchyMatcher() { .and(implementsInterface(named(hierarchyMarkerType()))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SpringWebHttpServerDecorator", - packageName + ".ServletRequestURIAdapter", - packageName + ".HandlerMappingResourceNameFilter", - packageName + ".HandlerMappingResourceNameFilter$BeanDefinition", - packageName + ".PathMatchingHttpServletRequestWrapper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletWithPathPatternsInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletWithPathPatternsInstrumentation.java index 98c1fab442c..82f55dc6eb6 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletWithPathPatternsInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/AppSecDispatcherServletWithPathPatternsInstrumentation.java @@ -35,11 +35,6 @@ public String instrumentedType() { return "org.springframework.web.servlet.DispatcherServlet"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".RequestMappingInfoWithPathPatternsIterator"}; - } - @Override public ElementMatcher.Junction classLoaderMatcher() { return hasClassNamed( diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/ServletPathRequestFilterInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/ServletPathRequestFilterInstrumentation.java index ee5744396ba..c9e84e755c9 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/ServletPathRequestFilterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/src/main/java/datadog/trace/instrumentation/springweb/ServletPathRequestFilterInstrumentation.java @@ -44,14 +44,6 @@ public ElementMatcher hierarchyMatcher() { .and(implementsInterface(named(hierarchyMarkerType()))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".OrderedServletPathRequestFilter", - packageName + ".OrderedServletPathRequestFilter$BeanDefinition", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java index 840429b1cb4..6cb136669c7 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java +++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java @@ -38,18 +38,6 @@ public String instrumentedType() { return MEMCACHED_PACKAGE + ".MemcachedClient"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".MemcacheClientDecorator", - packageName + ".CompletionListener", - packageName + ".SyncCompletionListener", - packageName + ".GetCompletionListener", - packageName + ".OperationCompletionListener", - packageName + ".BulkGetCompletionListener" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedConnectionInstrumentation.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedConnectionInstrumentation.java index 984be28a16b..664e88f07b9 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedConnectionInstrumentation.java +++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedConnectionInstrumentation.java @@ -38,13 +38,6 @@ public String instrumentedType() { return "net.spy.memcached.MemcachedConnection"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".MemcacheClientDecorator", - }; - } - public static class AddOperationAdvice { @Advice.OnMethodEnter public static void methodEnter(@Advice.Argument(0) final MemcachedNode node) { diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java index 2ce58b4b181..1782aaf6a47 100644 --- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java +++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java @@ -43,13 +43,6 @@ public String instrumentedType() { return "org.apache.synapse.transport.passthru.TargetHandler"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TargetRequestInjectAdapter", packageName + ".SynapseClientDecorator", - }; - } - @Override public void methodAdvice(final MethodTransformer transformer) { transformer.applyAdvices( diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientWorkerInstrumentation.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientWorkerInstrumentation.java index 71083340758..52b5f7577ea 100644 --- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientWorkerInstrumentation.java +++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientWorkerInstrumentation.java @@ -34,13 +34,6 @@ public String instrumentedType() { return "org.apache.synapse.transport.passthru.ClientWorker"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SynapseClientDecorator", - }; - } - @Override public void methodAdvice(final MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java index 6efb0410997..4e8b45fca3c 100644 --- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java +++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java @@ -36,16 +36,6 @@ public String instrumentedType() { return "org.apache.synapse.transport.passthru.SourceHandler"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ExtractAdapter", - packageName + ".ExtractAdapter$Request", - packageName + ".ExtractAdapter$Response", - packageName + ".SynapseServerDecorator", - }; - } - @Override public void methodAdvice(final MethodTransformer transformer) { transformer.applyAdvices( diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerWorkerInstrumentation.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerWorkerInstrumentation.java index 8a466228a16..7dd1d0f5e2f 100644 --- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerWorkerInstrumentation.java +++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerWorkerInstrumentation.java @@ -35,16 +35,6 @@ public String instrumentedType() { return "org.apache.synapse.transport.passthru.ServerWorker"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ExtractAdapter", - packageName + ".ExtractAdapter$Request", - packageName + ".ExtractAdapter$Response", - packageName + ".SynapseServerDecorator", - }; - } - @Override public void methodAdvice(final MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGInstrumentation.java index 0a6b01a8e9e..a37da23e5d7 100644 --- a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGInstrumentation.java +++ b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGInstrumentation.java @@ -44,19 +44,6 @@ public void methodAdvice(MethodTransformer transformer) { MethodDescription::isConstructor, TestNGInstrumentation.class.getName() + "$TestNGAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TestNGUtils", - packageName + ".TestNGSuiteListener", - packageName + ".TestNGClassListener", - packageName + ".TestEventsHandlerHolder", - packageName + ".TracingListener", - packageName + ".execution.RetryAnalyzer", - packageName + ".execution.RetryAnnotationTransformer", - }; - } - @Override public Map contextStore() { return Collections.singletonMap( diff --git a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGSkipInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGSkipInstrumentation.java index 9aafcdd32b2..d04d698e5ba 100644 --- a/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGSkipInstrumentation.java +++ b/dd-java-agent/instrumentation/testng/testng-common/src/main/java/datadog/trace/instrumentation/testng/TestNGSkipInstrumentation.java @@ -50,15 +50,6 @@ public void methodAdvice(MethodTransformer transformer) { TestNGSkipInstrumentation.class.getName() + "$InvokeMethodAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TestNGUtils", - packageName + ".TestNGClassListener", - packageName + ".TestEventsHandlerHolder", - }; - } - public static class InvokeMethodAdvice { @Advice.OnMethodEnter public static void invokeMethod( diff --git a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ElementTagStructureHandlerInstrumentation.java b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ElementTagStructureHandlerInstrumentation.java index 1d2858580c1..7e8d1854d34 100644 --- a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ElementTagStructureHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/ElementTagStructureHandlerInstrumentation.java @@ -30,11 +30,6 @@ public void methodAdvice(MethodTransformer transformer) { packageName + ".BodyAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".ThymeleafContext"}; - } - @Override public Map contextStore() { return singletonMap( diff --git a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/StandardUtextTagProcessorInstrumentation.java b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/StandardUtextTagProcessorInstrumentation.java index 38994d223d0..a55bfb9e86d 100644 --- a/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/StandardUtextTagProcessorInstrumentation.java +++ b/dd-java-agent/instrumentation/thymeleaf-3.0/src/main/java/datadog/trace/instrumentation/thymeleaf/StandardUtextTagProcessorInstrumentation.java @@ -22,11 +22,6 @@ public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice(isMethod().and(named("doProcess")), packageName + ".ProcessAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".ThymeleafContext"}; - } - @Override public Map contextStore() { return singletonMap( diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/GlassFishMultipartInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/GlassFishMultipartInstrumentation.java index 74dde6d6b38..061dc3f4ea2 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/GlassFishMultipartInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/GlassFishMultipartInstrumentation.java @@ -47,13 +47,6 @@ public String instrumentedType() { return "org.apache.catalina.fileupload.Multipart"; } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.tomcat7.GlassFishBlockingHelper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ParsePartsInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ParsePartsInstrumentation.java index 1799a9cbaa9..57cd8df4f60 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ParsePartsInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ParsePartsInstrumentation.java @@ -53,16 +53,6 @@ public String instrumentedType() { return "org.apache.catalina.connector.Request"; } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.tomcat7.ParameterCollector", - "datadog.trace.instrumentation.tomcat7.ParameterCollector$ParameterCollectorNoop", - "datadog.trace.instrumentation.tomcat7.ParameterCollector$ParameterCollectorImpl", - "datadog.trace.instrumentation.tomcat7.ParameterCollector$ParameterCollectorImpl$CachedMethods", - }; - } - @Override public void typeAdvice(TypeTransformer transformer) { transformer.applyAdvice(new ParsePartsVisitorWrapper()); diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java index d5f195939d1..34d07c06d45 100644 --- a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java @@ -59,14 +59,6 @@ public ElementMatcher hierarchyMatcher() { } /** Return the helper classes which will be available for use in instrumentation. */ - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TwilioClientDecorator", - packageName + ".TwilioClientDecorator$1", - packageName + ".SpanFinishingCallback", - }; - } /** Return bytebuddy transformers for instrumenting the Twilio SDK. */ @Override diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java index b83bd611637..f74bea7f85f 100644 --- a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java +++ b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java @@ -48,12 +48,6 @@ public ElementMatcher hierarchyMatcher() { } /** Return the helper classes which will be available for use in instrumentation. */ - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TwilioClientDecorator", packageName + ".TwilioClientDecorator$1" - }; - } /** Return bytebuddy transformers for instrumenting the Twilio SDK. */ @Override diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataParserInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataParserInstrumentation.java index 8f34ab5e9f9..6ced9be431d 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataParserInstrumentation.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/FormDataParserInstrumentation.java @@ -38,11 +38,6 @@ public String instrumentedType() { return "io.undertow.server.handlers.form.FormEncodedDataDefinition$FormEncodedDataParser"; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".FormDataMap"}; - } - private static final Reference EXCHANGE_REFERENCE = new Reference.Builder( "io.undertow.server.handlers.form.FormEncodedDataDefinition$FormEncodedDataParser") diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/MultiPartUploadHandlerInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/MultiPartUploadHandlerInstrumentation.java index 3f0313464d3..c414976c1c8 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/MultiPartUploadHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/MultiPartUploadHandlerInstrumentation.java @@ -51,11 +51,6 @@ public Reference[] additionalMuzzleReferences() { return new Reference[] {EXCHANGE_REFERENCE}; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".FormDataMap", packageName + ".FormDataContentHelper"}; - } - public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( named("parseBlocking") diff --git a/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/datadog/trace/instrumentation/valkey/ValkeyInstrumentation.java b/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/datadog/trace/instrumentation/valkey/ValkeyInstrumentation.java index a6c23153391..07730c8d228 100644 --- a/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/datadog/trace/instrumentation/valkey/ValkeyInstrumentation.java +++ b/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/datadog/trace/instrumentation/valkey/ValkeyInstrumentation.java @@ -34,13 +34,6 @@ public String instrumentedType() { return "io.valkey.Connection"; } - @Override - public String[] helperClassNames() { - return new String[] { - "io.valkey.ValkeyClientDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIInstrumentation.java index f1833dabfc5..ed5012b42f8 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIInstrumentation.java @@ -19,13 +19,6 @@ public RedisAPIInstrumentation() { super("vertx", "vertx-redis-client"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ResponseHandlerWrapper", packageName + ".VertxRedisClientDecorator", - }; - } - @Override public Map contextStore() { Map contextStores = new HashMap<>(); diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisInstrumentation.java index fef6e1da6c0..71db531bf43 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisInstrumentation.java @@ -33,15 +33,6 @@ public Map contextStore() { return contextStores; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ResponseHandlerWrapper", - packageName + ".ResponseHandler", - packageName + ".VertxRedisClientDecorator", - }; - } - @Override public String[] knownMatchingTypes() { return new String[] { diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorImplInstrumentation.java index f75bedd2d2d..a9a861cb92d 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorImplInstrumentation.java @@ -23,13 +23,6 @@ public Map contextStore() { return singletonMap("io.vertx.sqlclient.PreparedStatement", "datadog.trace.api.Pair"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".QueryResultHandlerWrapper", packageName + ".VertxSqlClientDecorator", - }; - } - @Override public String instrumentedType() { return "io.vertx.sqlclient.impl.CursorImpl"; diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedQueryInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedQueryInstrumentation.java index 41bf2f2c03b..7faf35e3f24 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedQueryInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/PreparedQueryInstrumentation.java @@ -29,13 +29,6 @@ public Map contextStore() { return singletonMap("io.vertx.sqlclient.Query", "datadog.trace.api.Pair"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".QueryResultHandlerWrapper", packageName + ".VertxSqlClientDecorator", - }; - } - @Override public String hierarchyMarkerType() { return "io.vertx.sqlclient.PreparedQuery"; diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryImplInstrumentation.java index dbc8fddd449..39bd1e1b102 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryImplInstrumentation.java @@ -26,13 +26,6 @@ public Map contextStore() { return singletonMap("io.vertx.sqlclient.Query", "datadog.trace.api.Pair"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".QueryResultHandlerWrapper", packageName + ".VertxSqlClientDecorator", - }; - } - @Override public String instrumentedType() { return "io.vertx.sqlclient.impl.SqlClientBase$QueryImpl"; diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlConnectionBaseInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlConnectionBaseInstrumentation.java index d2be6263170..ad5e70f0b00 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlConnectionBaseInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/SqlConnectionBaseInstrumentation.java @@ -28,11 +28,6 @@ public Map contextStore() { return contextStores; } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".PrepareHandlerWrapper"}; - } - @Override public String instrumentedType() { return "io.vertx.sqlclient.impl.SqlConnectionBase"; diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerRequestInstrumentation.java index 39c07a9a074..71f005cd032 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerRequestInstrumentation.java @@ -33,14 +33,6 @@ public Reference[] additionalMuzzleReferences() { return new Reference[] {PARSABLE_HEADER_VALUE, VIRTUAL_HOST_HANDLER}; } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.vertx_3_4.server.WafPublishingBodyHandler", - "datadog.trace.instrumentation.vertx_3_4.server.WafPublishingBodyHandler$BufferWrapper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseEndHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseEndHandlerInstrumentation.java index 28aa02442ff..ebaa7575df1 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseEndHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/HttpServerResponseEndHandlerInstrumentation.java @@ -16,16 +16,6 @@ public HttpServerResponseEndHandlerInstrumentation() { super("vertx", "vertx-3.4"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".EndHandlerWrapper", - packageName + ".RouteHandlerWrapper", - packageName + ".VertxDecorator", - packageName + ".VertxDecorator$VertxURIDataAdapter", - }; - } - @Override public String instrumentedType() { return "io.vertx.core.http.impl.HttpServerResponseImpl"; diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerInstrumentation.java index 6e4c5445d7d..ed4b4072038 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerInstrumentation.java @@ -17,16 +17,6 @@ public RouteHandlerInstrumentation() { super("vertx", "vertx-3.4"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".EndHandlerWrapper", - packageName + ".RouteHandlerWrapper", - packageName + ".VertxDecorator", - packageName + ".VertxDecorator$VertxURIDataAdapter", - }; - } - @Override public String instrumentedType() { return "io.vertx.ext.web.impl.RouteImpl"; diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteImplInstrumentation.java index 4de2a5d6995..742bf981de6 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteImplInstrumentation.java @@ -47,13 +47,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".PathParameterPublishingHelper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextImplInstrumentation.java index af8ee74bf18..d0f9f589bb8 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextImplInstrumentation.java @@ -27,11 +27,6 @@ public RoutingContextImplInstrumentation() { super("vertx", "vertx-3.4"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".FileUploadHelper"}; - } - @Override public String instrumentedType() { return "io.vertx.ext.web.impl.RoutingContextImpl"; diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxImplInstrumentation.java index 58a0c4da90c..881234a62fb 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/VertxImplInstrumentation.java @@ -25,15 +25,6 @@ public String instrumentedType() { return "io.vertx.core.impl.VertxImpl"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BlockingExceptionHandler", - packageName + ".VertxDecorator", - packageName + ".VertxDecorator$VertxURIDataAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerRequestInstrumentation.java index b68dc11f332..d8280ab2ea3 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerRequestInstrumentation.java @@ -31,14 +31,6 @@ public Reference[] additionalMuzzleReferences() { return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE}; } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.vertx_4_0.server.WafPublishingBodyHandler", - "datadog.trace.instrumentation.vertx_4_0.server.WafPublishingBodyHandler$BufferWrapper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerResponseEndHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerResponseEndHandlerInstrumentation.java index da2d589e475..473bf45eec0 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerResponseEndHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerResponseEndHandlerInstrumentation.java @@ -22,15 +22,6 @@ public Reference[] additionalMuzzleReferences() { return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE}; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".EndHandlerWrapper", - packageName + ".RouteHandlerWrapper", - packageName + ".VertxDecorator", - }; - } - @Override public String[] knownMatchingTypes() { return new String[] { diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerInstrumentation.java index 5cb72e52e65..cbce0265a27 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerInstrumentation.java @@ -23,15 +23,6 @@ public Reference[] additionalMuzzleReferences() { return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE}; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".EndHandlerWrapper", - packageName + ".RouteHandlerWrapper", - packageName + ".VertxDecorator", - }; - } - @Override public String instrumentedType() { return "io.vertx.ext.web.impl.RouteImpl"; diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteImplInstrumentation.java index a2041f43264..15042b1319a 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteImplInstrumentation.java @@ -45,13 +45,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".PathParameterPublishingHelper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextImplInstrumentation.java index 97623985225..3a3511dae63 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextImplInstrumentation.java @@ -30,11 +30,6 @@ public RoutingContextImplInstrumentation() { super("vertx", "vertx-4.0"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".FileUploadHelper"}; - } - @Override public Reference[] additionalMuzzleReferences() { return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE, FILE_UPLOAD_REF}; diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxImplInstrumentation.java index ce3dcab5b3d..6cafd31c120 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxImplInstrumentation.java @@ -31,13 +31,6 @@ public Reference[] additionalMuzzleReferences() { return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE}; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".BlockingExceptionHandler", packageName + ".VertxDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/HttpServerRequestInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/HttpServerRequestInstrumentation.java index 910d51456b5..1c72089627a 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/HttpServerRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/HttpServerRequestInstrumentation.java @@ -31,14 +31,6 @@ public Reference[] additionalMuzzleReferences() { return new Reference[] {VertxVersionMatcher.HTTP_HEADERS_INTERNAL}; } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.vertx_5_0.server.WafPublishingBodyHandler", - "datadog.trace.instrumentation.vertx_5_0.server.WafPublishingBodyHandler$BufferWrapper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/RoutingContextImplInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/RoutingContextImplInstrumentation.java index 627d7798f9e..5f4c1eba306 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/RoutingContextImplInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/RoutingContextImplInstrumentation.java @@ -24,11 +24,6 @@ public RoutingContextImplInstrumentation() { super("vertx", "vertx-5.0"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".FileUploadHelper"}; - } - @Override public String instrumentedType() { return "io.vertx.ext.web.impl.RoutingContextImpl"; diff --git a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java index be033fb009a..df438c27565 100644 --- a/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java +++ b/dd-java-agent/instrumentation/weaver-0.9/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java @@ -26,16 +26,6 @@ public String instrumentedType() { return "weaver.framework.SbtTask"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".WeaverUtils", - packageName + ".DatadogWeaverReporter", - packageName + ".TaskDefAwareLinkedBlockingQueueProxy", - packageName + ".TaskDefAwareConcurrentLinkedQueueProxy", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { // disneystreaming/weaver-test (0.8.4+) uses a ConcurrentLinkedQueue diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/JavaxWebsocketModule.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/JavaxWebsocketModule.java index 51014538f6e..0bfd038e125 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/JavaxWebsocketModule.java +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/JavaxWebsocketModule.java @@ -33,15 +33,6 @@ public Map contextStore() { return map; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TracingOutputStream", - packageName + ".TracingWriter", - packageName + ".TracingSendHandler", - }; - } - @Override protected boolean defaultEnabled() { return InstrumenterConfig.get().isWebsocketTracingEnabled(); diff --git a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java index fbe061a13ab..f6aebea9cbc 100644 --- a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java +++ b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java @@ -47,13 +47,6 @@ public ElementMatcher hierarchyMatcher() { return hasSuperType(declaresAnnotation(named(WEB_SERVICE_ANNOTATION_NAME))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".WebServiceDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java index 416317891df..6b88d44bd31 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java @@ -47,13 +47,6 @@ public ElementMatcher hierarchyMatcher() { return hasSuperType(declaresAnnotation(named(WEB_SERVICE_ANNOTATION_NAME))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".WebServiceDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java index 5e7d2f76842..ef7f2cb04c8 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java @@ -46,13 +46,6 @@ public ElementMatcher hierarchyMatcher() { .and(declaresAnnotation(named(WEB_SERVICE_PROVIDER_ANNOTATION_NAME))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".WebServiceProviderDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/ZioRuntimeInstrumentation.java b/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/ZioRuntimeInstrumentation.java index 64554e8b364..6b5e25609a4 100644 --- a/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/ZioRuntimeInstrumentation.java +++ b/dd-java-agent/instrumentation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/ZioRuntimeInstrumentation.java @@ -42,11 +42,6 @@ public void methodAdvice(MethodTransformer transformer) { isMethod().and(named("defaultSupervisor")), getClass().getName() + "$DefaultSupervisor"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".FiberContext", packageName + ".TracingSupervisor"}; - } - @Override public Map contextStore() { return singletonMap("zio.Fiber$Runtime", packageName + ".FiberContext");