Skip to content

Remove manually listed instrumentation helpers #12649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 2 commits into from
Sep 29, 2026
+0 −2,307
Merged

Remove manually listed instrumentation helpers #12649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2944b8
Remove manually listed instrumentation helpers
sarahchen6 Sep 25, 2026
577357c
Merge branch 'master' into sarahchen6/remove-helpers
sarahchen6 Sep 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions ...aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@ public AerospikeModule() {
super("aerospike");
}

@Override
public String[] helperClassNames() {
return new String[] {
packageName + ".AerospikeClientDecorator", packageName + ".TracingListener",
};
}

@Override
public List<Instrumenter> typeInstrumentations() {
final List<Instrumenter> ret = new ArrayList<>(4);
Expand Down
18 changes: 0 additions & 18 deletions .../src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
21 changes: 0 additions & 21 deletions ...0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
7 changes: 0 additions & 7 deletions ...n/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
12 changes: 0 additions & 12 deletions ...0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
14 changes: 0 additions & 14 deletions ...n/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
14 changes: 0 additions & 14 deletions ...ava/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
14 changes: 0 additions & 14 deletions .../datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[] {
Expand Down
14 changes: 0 additions & 14 deletions ...ace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
14 changes: 0 additions & 14 deletions .../java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
14 changes: 0 additions & 14 deletions ...ava/datadog/trace/instrumentation/akkahttp/appsec/StrictFormCompanionInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
8 changes: 0 additions & 8 deletions ...ain/java/datadog/trace/instrumentation/akkahttp/iast/CookieDirectivesInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
9 changes: 0 additions & 9 deletions ...in/java/datadog/trace/instrumentation/akkahttp/iast/ExtractDirectivesInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
11 changes: 0 additions & 11 deletions .../java/datadog/trace/instrumentation/akkahttp/iast/FormFieldDirectivesInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions ...ava/datadog/trace/instrumentation/akkahttp/iast/MarshallingDirectivesInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
11 changes: 0 additions & 11 deletions .../java/datadog/trace/instrumentation/akkahttp/iast/ParameterDirectivesInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions ...rc/main/java/datadog/trace/instrumentation/akkahttp/iast/UnmarshallerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<TypeDescription> hierarchyMatcher() {
return nameStartsWith("akka.http.scaladsl.unmarshalling.")
Expand Down
7 changes: 0 additions & 7 deletions ...atadog/trace/instrumentation/akkahttp102/iast/ParameterDirectivesImplInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions ...java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, String> contextStore() {
return singletonMap(
Expand Down
11 changes: 0 additions & 11 deletions .../java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,6 @@ public ElementMatcher<TypeDescription> 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
Expand Down
11 changes: 0 additions & 11 deletions ...datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,6 @@ public ElementMatcher<TypeDescription> 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(
Expand Down
Loading
Loading