From 8be3d4bea761388bbb852803aa1979f5c7395be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez=20Garc=C3=ADa?= Date: Wed, 30 Sep 2026 17:11:11 +0200 Subject: [PATCH 1/5] Expose OTel thread/process context without requiring profiling to be enabled (#12546) Expose OTel thread/process context without requiring profiling - Add Config.isDatadogProfilerSafeAndConfigured() as the raw ddprof env-safety/explicit-flag predicate, without the isProfilingEnabled() AND-prefix - Add Config.isOtelContextExposureEnabled(), defaulting to enabled when the profiler is safe/configured and either profiling is enabled or AppSec is fully enabled, with an explicit DD_TRACE_OTEL_CONTEXT_EXPOSURE_ENABLED override - Gate Agent.createProfilingContextIntegration()'s ddprof branch on the new flag (additive, ORed with the existing profiling gate) and reflectively register the process context even when profiling never starts - Add TRACE_OTEL_CONTEXT_EXPOSURE_ENABLED to OtlpConfig and supported-configurations.json Defer ddprof context integration construction past premain for AppSec-only trigger Constructing DatadogProfilingIntegration touches java.nio.file (via TempLocationManager) and loads the ddprof native library, which must not happen on the primordial premain thread. Users with the Datadog profiler enabled were unaffected (they already ran this synchronously), but the new AppSec-only trigger reached this construction from premain for the first time. DeferredProfilingContextIntegration wraps the real integration behind a NoOp delegate until AgentTaskScheduler runs the deferred construction off the premain thread, then swaps it in. The profiler-enabled path keeps the exact synchronous behavior it had before, since profiling accuracy needs every scope from the first one. Addresses a P1 finding from the Codex review on this PR. Drop dedicated OTel context exposure config flag, derive purely from profiling/AppSec isOtelContextExposureEnabled() no longer has its own explicit override. It mirrors isProfilingEnabled(), which has no dedicated sub-flag either: the kill switch is disabling DD_PROFILING_ENABLED and DD_APPSEC_ENABLED, the same flags that already drive the derivation. This removes the DD_TRACE_OTEL_CONTEXT_EXPOSURE_ENABLED public config entirely, along with its metadata/supported-configurations.json entry - so there is no new config requiring Feature Parity Dashboard registration, which was causing the config-inversion-local-validation.py CI job to fail. review: pre-PR checks - Add OtelContextExposureSmokeTest verifying OTel process context registration follows AppSec activation, not profiling - Extend DeferredProfilingContextIntegrationTest to cover all delegate pass-through methods (onAttach/onDetach/encodeOperationName/encodeResourceName/onRootSpanFinished), not just newScopeState/name review: remove decisions.md from tracked files decisions.md is a session-local planning artifact and should not ship as part of the PR diff; it is now added to the global gitignore alongside progress.md/task_plan.md. review: defer ddprof context construction with a startup delay Mitigates a P1 Autotest finding (PR #12546 discussion): the deferred construction was only moved off the premain thread, not delayed past premain/main startup, so it could still race with an application setting java.nio.file.spi.DefaultFileSystemProvider in main. Schedule it with the same delay magnitude Agent already uses for the analogous OkHttp/JUL startup race. review: defer profiling context engine tag until deferred construction succeeds - DeferredProfilingContextIntegration now exposes whenAvailable(Runnable), queuing callbacks until the real ddprof integration swaps in and never running them if construction fails. Default implementation runs inline, so the synchronous profiling/JFR path is unchanged. - CoreTracer stamps the _dd.profiling.ctx.engine tag through that callback instead of an identity check, so the tag is only ever set once the deferred integration actually becomes available, never unconditionally. - Bumped the deferred construction failure log to info, since it's the only signal that requested context exposure silently didn't happen. - Added useJUnitPlatform() to the springboot smoke test's testRuntimeActivation task, fixing the AppSec-inactive branch of OtelContextExposureSmokeTest never running in CI. review: limit testRuntimeActivation to the OTel exposure spec useJUnitPlatform() made the task discover every Spock spec in the source set, but it runs with AppSec forced inactive, which the other specs (e.g. SpringBootSmokeTest's 403 blocking assertions) don't tolerate. Filter the task to OtelContextExposureSmokeTest only. review: fix thread-safety race in CoreTracer local root span tags - Merge localRootSpanTags/localRootSpanTagsNeedIntercept into a single immutable LocalRootSpanTags holder published through one volatile reference, so a concurrent startSpan() never observes the new tag map paired with the stale intercept flag (introduced by this PR's deferred profiling context construction) revert: remove AppSec runtime-activation trigger for OTel context exposure Confirmed with product that no remote-config/one-click activation path is needed for this feature: CADR relies only on SSI and fleet (startup config), never on AppSec turning on later via remote config. Removes ActiveSubsystems.setAppSecActive/whenAppSecActivated and the associated callback list, Config.isOtelContextExposurePendingAppSecActivation, and Agent.createAppSecActivatedDdprofContextIntegration, plus their tests. The fix for the separate double process-context registration issue (Agent.ddprofContextIntegrationFactory's registerProcessContext param) is unrelated and stays untouched. Merge branch 'master' into otel-context-without-profiling fix: unwrap LocalRootSpanTags in DDTracerAPITest reflection CoreTracer.localRootSpanTags moved from a plain Map to a private LocalRootSpanTags{tags, needsIntercept} wrapper in 6b1c10df6f, so the test's cast to java.util.Map now throws ClassCastException. Reflect into the wrapper's tags field before casting. docs: remove stale remote-config activation paragraph from DeferredProfilingContextIntegration javadoc The runtime-activation path this described was reverted in b1d3bbb563; createDdprofContextIntegration() is now the only caller of scheduleInitialization(). fix: forward virtual-thread context binding in deferred wrapper; tighten smoke test assertion DeferredProfilingContextIntegration forwarded most methods to its delegate but fell back to the interface defaults for isThreadContextBindingRequired() and setContext(Context), so virtual-thread context rebinding silently never happened on the AppSec-only path even after the deferred ddprof integration was swapped in. OtelContextExposureSmokeTest only asserted the 'Registering process context...' log line, which is emitted unconditionally before the actual registration outcome is known. Also assert the failure log line is absent. fix: exclude AWS Lambda from ddprof context-exposure path; cover factory-level registration failure in smoke test docs: trim verbose Javadocs and inline comments per reviewer feedback Reduce multi-paragraph Javadocs to 1-2 lines across the OTel context exposure changes, keeping only non-obvious rationale. refactor: self-document OTel context config naming per reviewer feedback Rename isOtelContextExposureEnabled() to isOtelThreadContextEnabled() and the internal isDatadogProfilerEnabled field to isDatadogProfilerSafeAndConfigured so each name matches what it actually represents. Also replace remaining em dashes introduced by the previous comment-trimming commit. refactor: split ddprof context integration into load/defer paths per reviewer feedback Replace the single createDdprofContextIntegration/ddprofContextIntegrationFactory pair, which reused one boolean flag for two unrelated purposes (defer-vs-sync construction, and process-context registration), with four dedicated methods: loadDdprofContextIntegration, deferDdprofContextIntegration, and the shared private helpers newDdprofContextIntegration and registerProcessContext. Also apply double-checked locking to DeferredProfilingContextIntegration#whenAvailable, now safe since delegate is volatile, and clarify the initialize() Javadoc contract. refactor: drop redundant Windows check in createProfilingContextIntegration Config.isDatadogProfilerEnabled() and Config.isOtelThreadContextEnabled() already resolve to false on Windows via isDatadogProfilerSafeAndConfigured (isDatadogProfilerEnablementOverridden() checks OperatingSystem.isWindows()), so the local OperatingSystem.isWindows() check here was a second, independently-maintained exclusion. AWS Lambda has no equivalent Config-side guard, so !isAwsLambdaRuntime() stays. test: cover null-returning factory in DeferredProfilingContextIntegration initialize() already guards against a null integration from the factory, but no test constructed one, so a mutation deleting that guard would have survived (delegate=null, NPE on any pass-through call after initialize()). test: rename disabledInAnEnvironmentWhereTheDatadogProfilerIsUnsafe The method name overclaimed what the test covers: it drives the same raw-predicate short-circuit as the explicit-disable test via an env var, not a genuine environment-detection veto (already explained in the javadoc). Renamed for honesty; no behavior change. Merge branch 'master' into otel-context-without-profiling Add explicit profiling guard and needsIntercept regression test - Make the !isProfilingEnabled() invariant on the ddprof context-only branch explicit in Agent.createProfilingContextIntegration(), per reviewer feedback that there was no local guard against skipping the JFR-events fallback. - Add a regression test pinning the needsIntercept() recomputation in CoreTracer.stampProfilingContextEngine(), covering the trace.split-by-tags scenario raised in review. fix: register OTel process context before constructing ddprof trace-context integration Process context registration for CWS/eBPF must not depend on the trace-context (ddprof) integration succeeding: it already handles its own failures, but the previous ordering meant a throwing newDdprofContextIntegration call (e.g. native library init failure) silently prevented registerProcessContext from ever running. Merge branch 'master' into otel-context-without-profiling fix: skip OtelContextExposureSmokeTest on J9 AbstractSmokeTest forces -Ddd.profiling.ddprof.enabled=false on J9 (known jmethodID crashes), so the OTel process context registration this test asserts on is unreachable by construction there, not flaky. J9 stays covered by ConfigOtelContextExposureTest. Merge branch 'master' into otel-context-without-profiling Co-authored-by: devflow.devflow-routing-intake From bd1d202cee9d802736eaa0eb8963111e33517144 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 28 Sep 2026 16:30:10 -0400 Subject: [PATCH 2/5] Easy wins --- .../aws/v2/s3/S3ClientInstrumentation.java | 5 ---- .../GradleBuildListenerInstrumentation.java | 14 ---------- .../legacy/GradleProjectConfigurator.groovy | 5 ---- ...ildScopeServices_8_10_Instrumentation.java | 7 ----- ...uildScopeServices_8_3_Instrumentation.java | 7 ----- .../gradle/GradleLauncherInstrumentation.java | 7 ----- .../jedis/JedisInstrumentation.java | 7 ----- .../OpenTelemetryMetricsInstrumentation.java | 27 ------------------- .../ScalatestForkInstrumentation.java | 5 ---- ...artaHttpServletRequestInstrumentation.java | 5 ---- .../spray/SprayHttpServerInstrumentation.java | 15 ----------- .../SpringRepositoryInstrumentation.java | 9 ------- 12 files changed, 113 deletions(-) diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java index 0a675c969b4..38033bd76fe 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/S3ClientInstrumentation.java @@ -29,11 +29,6 @@ public void methodAdvice(MethodTransformer transformer) { S3ClientInstrumentation.class.getName() + "$AwsS3BuilderAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".S3Interceptor"}; - } - public static class AwsS3BuilderAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void addHandler(@Advice.Return final List interceptors) { diff --git a/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java index b7a38e9ef29..e45ab9ba98d 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java @@ -31,20 +31,6 @@ public String instrumentedType() { return "org.gradle.invocation.DefaultGradle"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".GradleUtils", - packageName + ".GradleProjectConfigurator", - packageName + ".GradleProjectConfigurator$_configureCompilerPlugin_closure1", - packageName + ".GradleProjectConfigurator$_configureJacoco_closure2", - packageName + ".GradleProjectConfigurator$_configureJacoco_closure3", - packageName + ".GradleProjectConfigurator$_forEveryTestTask_closure4", - packageName + ".GradleBuildListener", - packageName + ".GradleBuildListener$TestTaskExecutionListener" - }; - } - @Override public boolean isEnabled() { return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled(); diff --git a/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy b/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy index d2ef66ce277..b4a039131b0 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy +++ b/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy @@ -35,11 +35,6 @@ import java.util.regex.Pattern */ class GradleProjectConfigurator { - /* - * Each Groovy Closure in here is a separate class. - * When adding or removing a closure, be sure to update {@link GradleBuildListenerInstrumentation#helperClassNames()} - */ - public static final GradleProjectConfigurator INSTANCE = new GradleProjectConfigurator() private static final String JACOCO_PLUGIN_ID = 'jacoco' diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java index aa40040f97e..bb81be31f8a 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java +++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java @@ -34,13 +34,6 @@ public String instrumentedType() { return "org.gradle.internal.service.ScopedServiceRegistry"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CiVisibilityGradleListenerInjector_8_10", - }; - } - @Override public boolean isEnabled() { return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled(); diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java index 1f7616b2184..71fd02280ad 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java +++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java @@ -33,13 +33,6 @@ public String instrumentedType() { return "org.gradle.internal.service.scopes.BuildScopeServices"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CiVisibilityGradleListenerInjector_8_3", - }; - } - @Override public boolean isEnabled() { return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled(); diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java index 5c16964e933..4c93db0125b 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java +++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java @@ -42,13 +42,6 @@ public void methodAdvice(MethodTransformer transformer) { GradleLauncherInstrumentation.class.getName() + "$PropertiesAugmentationAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".GradleDaemonInjectionUtils", - }; - } - public static class PropertiesAugmentationAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void addJavaagentToGradleDaemonProperties( diff --git a/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java index 039a8364f60..a199774f379 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java @@ -41,13 +41,6 @@ public String instrumentedType() { return "redis.clients.jedis.Connection"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JedisClientDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/main/java/datadog/trace/instrumentation/opentelemetry147/OpenTelemetryMetricsInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/main/java/datadog/trace/instrumentation/opentelemetry147/OpenTelemetryMetricsInstrumentation.java index 4cb6fd79ede..2ca970d0873 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/main/java/datadog/trace/instrumentation/opentelemetry147/OpenTelemetryMetricsInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/src/main/java/datadog/trace/instrumentation/opentelemetry147/OpenTelemetryMetricsInstrumentation.java @@ -59,33 +59,6 @@ public boolean onlyMatchKnownTypes() { return isShortcutMatchingEnabled(false); } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.opentelemetry.shim.metrics.OtelMeter", - "datadog.opentelemetry.shim.metrics.OtelMeterBuilder", - "datadog.opentelemetry.shim.metrics.OtelMeterProvider", - "datadog.opentelemetry.shim.metrics.OtelDoubleCounter", - "datadog.opentelemetry.shim.metrics.OtelDoubleCounter$Builder", - "datadog.opentelemetry.shim.metrics.OtelDoubleGauge", - "datadog.opentelemetry.shim.metrics.OtelDoubleGauge$Builder", - "datadog.opentelemetry.shim.metrics.OtelDoubleHistogram", - "datadog.opentelemetry.shim.metrics.OtelDoubleHistogram$Builder", - "datadog.opentelemetry.shim.metrics.OtelDoubleUpDownCounter", - "datadog.opentelemetry.shim.metrics.OtelDoubleUpDownCounter$Builder", - "datadog.opentelemetry.shim.metrics.OtelLongCounter", - "datadog.opentelemetry.shim.metrics.OtelLongCounter$Builder", - "datadog.opentelemetry.shim.metrics.OtelLongGauge", - "datadog.opentelemetry.shim.metrics.OtelLongGauge$Builder", - "datadog.opentelemetry.shim.metrics.OtelLongHistogram", - "datadog.opentelemetry.shim.metrics.OtelLongHistogram$Builder", - "datadog.opentelemetry.shim.metrics.OtelLongUpDownCounter", - "datadog.opentelemetry.shim.metrics.OtelLongUpDownCounter$Builder", - "datadog.opentelemetry.shim.metrics.OtelObservableCallback", - "datadog.opentelemetry.shim.metrics.OtelObservableMeasurement", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { // MeterProvider OpenTelemetry.getMeterProvider() diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestForkInstrumentation.java b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestForkInstrumentation.java index 8f1398bfaae..544c6084cf0 100644 --- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestForkInstrumentation.java +++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestForkInstrumentation.java @@ -30,11 +30,6 @@ public String instrumentedType() { return "org.scalatest.tools.Framework"; } - @Override - public String[] helperClassNames() { - return new String[] {}; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java index b9f2eef01dc..1aa2d869a56 100644 --- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.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/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerInstrumentation.java b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerInstrumentation.java index b65c76f10ea..a6e5cbf05cc 100644 --- a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerInstrumentation.java +++ b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerInstrumentation.java @@ -19,21 +19,6 @@ public String instrumentedType() { return "spray.routing.HttpServiceBase$class"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SprayHeaders", - packageName + ".SprayHeaders$Request", - packageName + ".SprayHeaders$Response", - packageName + ".SprayHelper", - packageName + ".SprayHelper$", - packageName + ".SprayHelper$$anonfun$wrapRequestContext$1", - packageName + ".SprayHelper$$anonfun$wrapRoute$1", - packageName + ".SprayHttpServerDecorator", - packageName + ".SprayURIAdapter" - }; - } - /** * Spray has 'nested' function called runSealedRoute that runs route with all handlers wrapped * around it. This gives us access to a 'final' response that we can use to get all data for the diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java index 2c254f0286c..eeacdb050d9 100644 --- a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java @@ -24,15 +24,6 @@ public String instrumentedType() { return "org.springframework.data.repository.core.support.RepositoryFactorySupport"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".SpringDataDecorator", - packageName + ".RepositoryInterceptor", - packageName + ".InterceptingRepositoryProxyPostProcessor", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( From dc07c74e32413c1d23b2216f9992e1e657561047 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 28 Sep 2026 16:58:31 -0400 Subject: [PATCH 3/5] second pass --- .../axway/AxwayHTTPPluginInstrumentation.java | 10 ------- .../client/BaseRequestInstrumentation.java | 9 ------- ...CoreEnvironmentBuilderInstrumentation.java | 10 ------- .../DefaultErrorUtilInstrumentation.java | 9 ------- .../client/BaseRequestInstrumentation.java | 10 ------- .../DefaultErrorUtilInstrumentation.java | 10 ------- .../hazelcast4/HazelcastModule.java | 10 ------- .../ContainerRequestInstrumentation.java | 7 ----- .../junit4/JUnit4SkipInstrumentation.java | 11 -------- .../JUnit4SuiteEventsInstrumentation.java | 11 -------- ...JUnitLegacySuiteEventsInstrumentation.java | 11 -------- ...it5NodeTestTaskContextInstrumentation.java | 7 ----- .../maven3/MavenInstrumentation.java | 11 -------- .../mule4/AbstractMuleInstrumentation.java | 10 ------- .../ChannelFutureListenerInstrumentation.java | 22 --------------- .../openai_java/ChatCompletionModule.java | 16 ----------- .../openai_java/CompletionModule.java | 13 --------- .../openai_java/EmbeddingModule.java | 13 --------- .../openai_java/ResponseModule.java | 17 ------------ .../OpenTelemetryLogsInstrumentation.java | 10 ------- .../OpenTelemetryContextInstrumentation.java | 27 ------------------- ...elemetryContextStorageInstrumentation.java | 27 ------------------- .../WithSpanAnnotationInstrumentation.java | 10 ------- ...AbstractRequestContextInstrumentation.java | 7 ----- .../ScalatestSkipInstrumentation.java | 9 ------- .../ScalatestExecutionInstrumentation.java | 11 -------- .../RumAsyncContextInstrumentation.java | 7 ----- .../servlet3/AsyncContextInstrumentation.java | 13 --------- .../RumAsyncContextInstrumentation.java | 7 ----- .../HttpServletResponseInstrumentation.java | 8 ------ .../spark/OpenLineageInstrumentation.java | 16 ----------- .../AbstractTibcoInstrumentation.java | 10 ------- .../AbstractTibcoInstrumentation.java | 7 ----- 33 files changed, 386 deletions(-) diff --git a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginInstrumentation.java b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginInstrumentation.java index e8d9bb1785d..08dfab98087 100644 --- a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginInstrumentation.java +++ b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/AxwayHTTPPluginInstrumentation.java @@ -32,16 +32,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".StateAdvice", - packageName + ".AxwayHTTPPluginDecorator", - packageName + ".HTTPPluginAdvice", - packageName + ".ServerTransactionAdvice", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestInstrumentation.java index 5717db6a6f5..e2df39ec757 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/BaseRequestInstrumentation.java @@ -16,15 +16,6 @@ public BaseRequestInstrumentation() { super("couchbase", "couchbase-3"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CouchbaseClientDecorator", - packageName + ".DatadogRequestSpan", - packageName + ".DatadogRequestTracer", - }; - } - @Override public String instrumentedType() { return "com.couchbase.client.core.msg.BaseRequest"; diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderInstrumentation.java index 35dbc6c6830..5eef7d52e7f 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/CoreEnvironmentBuilderInstrumentation.java @@ -17,16 +17,6 @@ public CoreEnvironmentBuilderInstrumentation() { super("couchbase", "couchbase-3"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CouchbaseClientDecorator", - packageName + ".DatadogRequestSpan", - packageName + ".DatadogRequestTracer", - packageName + ".SeedNodeHelper", - }; - } - @Override public Map contextStore() { return Collections.singletonMap("com.couchbase.client.core.Core", String.class.getName()); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilInstrumentation.java index e70ee102936..0071856ac07 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DefaultErrorUtilInstrumentation.java @@ -17,15 +17,6 @@ public DefaultErrorUtilInstrumentation() { super("couchbase", "couchbase-3"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CouchbaseClientDecorator", - packageName + ".DatadogRequestSpan", - packageName + ".DatadogRequestTracer", - }; - } - @Override public String instrumentedType() { return "com.couchbase.client.core.error.DefaultErrorUtil"; diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestInstrumentation.java index 81d1e5d0475..73cb1a26ddb 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/BaseRequestInstrumentation.java @@ -15,16 +15,6 @@ public BaseRequestInstrumentation() { super("couchbase", "couchbase-3"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CouchbaseClientDecorator", - packageName + ".DatadogRequestSpan", - packageName + ".DatadogRequestSpan$1", - packageName + ".DatadogRequestTracer", - }; - } - @Override public String instrumentedType() { return "com.couchbase.client.core.msg.BaseRequest"; diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilInstrumentation.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilInstrumentation.java index d034f29afcc..f97cdfcb5dc 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilInstrumentation.java +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DefaultErrorUtilInstrumentation.java @@ -16,16 +16,6 @@ public DefaultErrorUtilInstrumentation() { super("couchbase", "couchbase-3"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CouchbaseClientDecorator", - packageName + ".DatadogRequestSpan", - packageName + ".DatadogRequestSpan$1", - packageName + ".DatadogRequestTracer", - }; - } - @Override public String instrumentedType() { return "com.couchbase.client.core.error.DefaultErrorUtil"; diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastModule.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastModule.java index 92eed9bdf11..a3770395f58 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastModule.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastModule.java @@ -28,16 +28,6 @@ protected boolean defaultEnabled() { return DEFAULT_ENABLED; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".HazelcastConstants", - packageName + ".HazelcastDecorator", - packageName + ".SpanFinishingExecutionCallback", - packageName + ".InvocationAdvice" - }; - } - @Override public Map contextStore() { return Collections.singletonMap( diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/ContainerRequestInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/ContainerRequestInstrumentation.java index 74813cf1b61..82e4bb8d976 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/ContainerRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/src/main/java/datadog/trace/instrumentation/jersey/ContainerRequestInstrumentation.java @@ -39,13 +39,6 @@ public String instrumentedType() { return "org.glassfish.jersey.server.ContainerRequest"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JerseyTaintHelper", - }; - } - @RequiresRequestContext(RequestContextSlot.IAST) public static class SetPropertyAdvice { @Advice.OnMethodExit(suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java index 6c836900614..5fcbf53ea9e 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java @@ -53,17 +53,6 @@ public ElementMatcher hierarchyMatcher() { .and(not(extendsClass(named("io.cucumber.junit.FeatureRunner")))); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TestEventsHandlerHolder", - packageName + ".SkippedByDatadog", - packageName + ".JUnit4Utils", - packageName + ".TracingListener", - packageName + ".JUnit4TracingListener", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java index 37c4f3d5fe5..a7159caac8c 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java @@ -36,17 +36,6 @@ public ElementMatcher hierarchyMatcher() { return extendsClass(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TestEventsHandlerHolder", - packageName + ".SkippedByDatadog", - packageName + ".JUnit4Utils", - packageName + ".TracingListener", - packageName + ".JUnit4TracingListener", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java index 71ad815128c..d77684a2884 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java @@ -34,17 +34,6 @@ public String[] knownMatchingTypes() { }; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TestEventsHandlerHolder", - packageName + ".SkippedByDatadog", - packageName + ".JUnit4Utils", - packageName + ".TracingListener", - packageName + ".JUnit4TracingListener", - }; - } - @Override public int order() { // Should be applied after datadog.trace.instrumentation.junit4.JUnit4Instrumentation, diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5NodeTestTaskContextInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5NodeTestTaskContextInstrumentation.java index b273817c40a..f935746cb3b 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5NodeTestTaskContextInstrumentation.java +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5NodeTestTaskContextInstrumentation.java @@ -33,13 +33,6 @@ public String instrumentedType() { return "org.junit.platform.engine.support.hierarchical.NodeTestTaskContext"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ThrowableCollectorFactoryWrapper", parentPackageName + ".JUnitPlatformUtils" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java index 9d0db79b990..0945fed638d 100644 --- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java +++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java @@ -32,17 +32,6 @@ public ElementMatcher hierarchyMatcher() { return extendsClass(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".MavenTestExecution", - packageName + ".MavenUtils", - packageName + ".MavenExecutionListener", - packageName + ".MavenProjectConfigurator", - packageName + ".MavenLifecycleParticipant", - }; - } - @Override public boolean isEnabled() { return super.isEnabled() && Config.get().isCiVisibilityBuildInstrumentationEnabled(); diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/AbstractMuleInstrumentation.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/AbstractMuleInstrumentation.java index be26ff448b1..f2f66275dd2 100644 --- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/AbstractMuleInstrumentation.java +++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/AbstractMuleInstrumentation.java @@ -23,14 +23,4 @@ public Map contextStore() { "org.mule.runtime.api.component.Component"); return contextStore; } - - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".MuleDecorator", - packageName + ".DDEventTracer", - packageName + ".SpanState", - packageName + ".NoopMuleSpan", - }; - } } diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java index c303b132ed4..ddb3516a871 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java @@ -42,28 +42,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.HttpServerRequestTracingHandler", - packageName + ".server.HttpServerResponseTracingHandler", - packageName + ".server.HttpServerTracingHandler" - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionModule.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionModule.java index 9c4380b3ffe..c94991baecc 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionModule.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionModule.java @@ -12,22 +12,6 @@ public ChatCompletionModule() { super("openai-java"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CommonTags", - packageName + ".TokenUsage", - packageName + ".ChatCompletionDecorator", - packageName + ".OpenAiDecorator", - packageName + ".JsonValueUtils", - packageName + ".HttpResponseWrapper", - packageName + ".HttpStreamResponseWrapper", - packageName + ".HttpStreamResponseStreamWrapper", - packageName + ".ToolCallExtractor", - packageName + ".ToolCallExtractor$1" - }; - } - @Override public List typeInstrumentations() { return Arrays.asList( diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionModule.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionModule.java index 171290a983c..9e4f736702d 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionModule.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionModule.java @@ -12,19 +12,6 @@ public CompletionModule() { super("openai-java"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CommonTags", - packageName + ".TokenUsage", - packageName + ".CompletionDecorator", - packageName + ".OpenAiDecorator", - packageName + ".HttpResponseWrapper", - packageName + ".HttpStreamResponseWrapper", - packageName + ".HttpStreamResponseStreamWrapper", - }; - } - @Override public List typeInstrumentations() { return Arrays.asList( diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingModule.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingModule.java index 8de3ab8a4ec..807eb0b6abd 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingModule.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingModule.java @@ -12,19 +12,6 @@ public EmbeddingModule() { super("openai-java"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CommonTags", - packageName + ".TokenUsage", - packageName + ".EmbeddingDecorator", - packageName + ".OpenAiDecorator", - packageName + ".HttpResponseWrapper", - packageName + ".HttpStreamResponseWrapper", - packageName + ".HttpStreamResponseStreamWrapper", - }; - } - @Override public List typeInstrumentations() { return Collections.singletonList(new EmbeddingServiceInstrumentation()); diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseModule.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseModule.java index b584b89d500..3fa30a82d3f 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseModule.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseModule.java @@ -12,23 +12,6 @@ public ResponseModule() { super("openai-java"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".CommonTags", - packageName + ".TokenUsage", - packageName + ".ResponseDecorator", - packageName + ".FunctionCallOutputExtractor", - packageName + ".OpenAiDecorator", - packageName + ".JsonValueUtils", - packageName + ".HttpResponseWrapper", - packageName + ".HttpStreamResponseWrapper", - packageName + ".HttpStreamResponseStreamWrapper", - packageName + ".ToolCallExtractor", - packageName + ".ToolCallExtractor$1" - }; - } - @Override public List typeInstrumentations() { return Arrays.asList( diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/main/java/datadog/trace/instrumentation/opentelemetry127/OpenTelemetryLogsInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/main/java/datadog/trace/instrumentation/opentelemetry127/OpenTelemetryLogsInstrumentation.java index ca9219cba91..497c4305a20 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/main/java/datadog/trace/instrumentation/opentelemetry127/OpenTelemetryLogsInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/src/main/java/datadog/trace/instrumentation/opentelemetry127/OpenTelemetryLogsInstrumentation.java @@ -58,16 +58,6 @@ public boolean onlyMatchKnownTypes() { return isShortcutMatchingEnabled(false); } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.opentelemetry.shim.logs.OtelLogger", - "datadog.opentelemetry.shim.logs.OtelLoggerBuilder", - "datadog.opentelemetry.shim.logs.OtelLoggerProvider", - "datadog.opentelemetry.shim.logs.OtelLogRecordBuilder", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { // LoggerProvider OpenTelemetry.getLogsBridge() diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java index fe0714ce433..3772567dbc8 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java @@ -51,33 +51,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.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) { // Context Context.root() diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java index a5e6f5ce945..cf261105de2 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java @@ -52,33 +52,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.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) { // Context ContextStorage.current() diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAnnotationInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAnnotationInstrumentation.java index de8c5ba30e9..1391e63e628 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAnnotationInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAnnotationInstrumentation.java @@ -38,16 +38,6 @@ public ElementMatcher hierarchyMatcher() { return declaresMethod(isAnnotatedWith(named(hierarchyMarkerType()))); } - @Override - public String[] helperClassNames() { - return new String[] { - this.packageName + ".WithSpanDecorator", - this.packageName + ".WithSpanDecorator$1", // Switch over enum generated class - "datadog.opentelemetry.shim.trace.OtelConventions", - "datadog.opentelemetry.shim.trace.OtelConventions$1", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { ElementMatcher.Junction annotatedMethodMatcher = diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/AbstractRequestContextInstrumentation.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/AbstractRequestContextInstrumentation.java index d828639bef0..16e1c61b520 100644 --- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/AbstractRequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/AbstractRequestContextInstrumentation.java @@ -27,13 +27,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".JakartaRsAnnotationsDecorator", packageName + ".RequestFilterHelper", - }; - } - @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/ScalatestSkipInstrumentation.java b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestSkipInstrumentation.java index 22149f9a2a4..63e0a718890 100644 --- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestSkipInstrumentation.java +++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestSkipInstrumentation.java @@ -30,15 +30,6 @@ public String[] knownMatchingTypes() { return new String[] {"org.scalatest.Filter", "org.scalatest.Args"}; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ScalatestUtils", - packageName + ".RunContext", - packageName + ".DatadogReporter", - }; - } - @Override public Map contextStore() { return Collections.singletonMap("org.scalatest.Filter", packageName + ".RunContext"); diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/ScalatestExecutionInstrumentation.java b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/ScalatestExecutionInstrumentation.java index 31579b04ec7..ed206c9e597 100644 --- a/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/ScalatestExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/scalatest-3.0.8/src/main/java/datadog/trace/instrumentation/scalatest/execution/ScalatestExecutionInstrumentation.java @@ -49,17 +49,6 @@ public ElementMatcher hierarchyMatcher() { return extendsClass(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - parentPackageName + ".ScalatestUtils", - parentPackageName + ".RunContext", - parentPackageName + ".DatadogReporter", - packageName + ".SuppressedTestFailedException", - packageName + ".TestExecutionWrapper", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumAsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumAsyncContextInstrumentation.java index 2d5764d68ad..abed23b36e5 100644 --- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumAsyncContextInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumAsyncContextInstrumentation.java @@ -29,13 +29,6 @@ public String hierarchyMarkerType() { return "jakarta.servlet.AsyncContext"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RumHttpServletResponseWrapper", packageName + ".WrappedServletOutputStream", - }; - } - @Override public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java index d1a2432d16d..2043b17ed97 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java @@ -51,19 +51,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AsyncDispatcherDecorator", - packageName + ".FinishAsyncDispatchListener", - packageName + ".HttpServletExtractAdapter", - packageName + ".HttpServletExtractAdapter$Request", - packageName + ".HttpServletExtractAdapter$Response", - packageName + ".Servlet3Decorator", - packageName + ".ServletRequestURIAdapter", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumAsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumAsyncContextInstrumentation.java index e29aa3b2129..f4158cd0bd0 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumAsyncContextInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumAsyncContextInstrumentation.java @@ -29,13 +29,6 @@ public String hierarchyMarkerType() { return "javax.servlet.AsyncContext"; } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".RumHttpServletResponseWrapper", packageName + ".WrappedServletOutputStream", - }; - } - @Override public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java index 27a1d8ef7aa..ac999ac4f8f 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java @@ -39,14 +39,6 @@ public ElementMatcher hierarchyMatcher() { return implementsInterface(named(hierarchyMarkerType())); } - @Override - public String[] helperClassNames() { - return new String[] { - "datadog.trace.instrumentation.servlet.ServletRequestSetter", - packageName + ".HttpServletResponseDecorator", - }; - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenLineageInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenLineageInstrumentation.java index 2eedacfceae..ac5151bf2b5 100644 --- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenLineageInstrumentation.java +++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenLineageInstrumentation.java @@ -23,22 +23,6 @@ public OpenLineageInstrumentation() { super("spark-openlineage"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".AbstractDatadogSparkListener", - packageName + ".DatabricksParentContext", - packageName + ".OpenlineageParentContext", - packageName + ".PredeterminedTraceIdContext", - packageName + ".RemoveEldestHashMap", - packageName + ".SparkAggregatedTaskMetrics", - packageName + ".SparkConfAllowList", - packageName + ".SparkSQLUtils", - packageName + ".SparkSQLUtils$SparkPlanInfoForStage", - packageName + ".SparkSQLUtils$AccumulatorWithStage", - }; - } - @Override public boolean defaultEnabled() { return false; diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/AbstractTibcoInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/AbstractTibcoInstrumentation.java index 00502c6987b..3a9993f3411 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/AbstractTibcoInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/AbstractTibcoInstrumentation.java @@ -13,14 +13,4 @@ public AbstractTibcoInstrumentation() { public Map contextStore() { return Collections.singletonMap("com.tibco.pe.plugin.ProcessContext", Map.class.getName()); } - - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TibcoDecorator", - packageName + ".ActivityHelper", - packageName + ".ActivityHelper$ActivityInfo", - "com.tibco.pe.core.DDJobMate", - }; - } } diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java index 0e5c427c636..c6ce60dd34c 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java @@ -28,11 +28,4 @@ public Map contextStore() { "com.tibco.bw.jms.shared.api.receive.JMSMessageCallBackHandler", String.class.getName()); return stores; } - - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".TibcoDecorator", packageName + ".IgnoreHelper", - }; - } } From c35f14c20be1ba650983bac8a4f5d5042c94df98 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 29 Sep 2026 14:04:07 -0400 Subject: [PATCH 4/5] third pass --- .../httpclient/HttpClientInstrumentation.java | 1 - .../JettyClientInstrumentation.java | 1 - .../JettyClientInstrumentation.java | 1 - .../JUnit4CucumberSkipInstrumentation.java | 1 - .../kafka_clients/MetadataInstrumentation.java | 1 - .../kafka_clients38/MetadataInstrumentation.java | 1 - .../KafkaStreamTaskInstrumentation.java | 1 - .../LettuceReactiveClientInstrumentation.java | 3 +-- .../ChannelFutureListenerInstrumentation.java | 6 ------ .../spark/Spark212Instrumentation.java | 1 - .../spark/Spark213Instrumentation.java | 1 - .../TestNGClassListenerInstrumentation.java | 4 +--- .../TestNGClassListenerInstrumentation.java | 4 +--- .../undertow/UndertowInstrumentation.java | 16 ---------------- 14 files changed, 3 insertions(+), 39 deletions(-) diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java index e0a995378de..e0d0d6ec1e8 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java @@ -56,7 +56,6 @@ public String[] helperClassNames() { packageName + ".BodyHandlerWrapper", packageName + ".BodyHandlerWrapper$BodySubscriberWrapper", packageName + ".BodyHandlerWrapper$SubscriptionWrapper", - packageName + ".CompletableFutureWrapper", packageName + ".JavaNetClientDecorator", packageName + ".ResponseConsumer" }; diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java index 24a8c15cf53..735571296f8 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java @@ -35,7 +35,6 @@ public String[] helperClassNames() { return new String[] { packageName + ".JettyClientDecorator", "datadog.trace.instrumentation.jetty_client.HeadersInjectAdapter", - "datadog.trace.instrumentation.jetty_client.CallbackWrapper", packageName + ".SpanFinishingCompleteListener" }; } diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java index eb0ffb52c1e..03c45052ae7 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java @@ -47,7 +47,6 @@ public String[] helperClassNames() { return new String[] { packageName + ".JettyClientDecorator", "datadog.trace.instrumentation.jetty_client.HeadersInjectAdapter", - "datadog.trace.instrumentation.jetty_client.CallbackWrapper", packageName + ".SpanFinishingCompleteListener" }; } diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java index c4bd3ed6df6..18ff1661285 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java @@ -57,7 +57,6 @@ public String[] helperClassNames() { packageName + ".SkippedByDatadog", packageName + ".JUnit4Utils", packageName + ".TracingListener", - packageName + ".CucumberTracingListener", }; } diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java index 94063de4412..4b565b42b6f 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java @@ -54,7 +54,6 @@ public ElementMatcher hierarchyMatcher() { @Override public String[] helperClassNames() { return new String[] { - packageName + ".KafkaDecorator", "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper", "datadog.trace.instrumentation.kafka_common.PendingConfig", "datadog.trace.instrumentation.kafka_common.MetadataState", diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java index 3907ad0c18c..7d2d2b9ca61 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java @@ -40,7 +40,6 @@ public ElementMatcher hierarchyMatcher() { @Override public String[] helperClassNames() { return new String[] { - packageName + ".KafkaDecorator", "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper", "datadog.trace.instrumentation.kafka_common.PendingConfig", "datadog.trace.instrumentation.kafka_common.MetadataState", diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java index 0da251f1cd5..1131bf8b710 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java @@ -72,7 +72,6 @@ public String instrumentedType() { @Override public String[] helperClassNames() { return new String[] { - "datadog.trace.instrumentation.kafka_clients.TextMapInjectAdapterInterface", "datadog.trace.instrumentation.kafka_clients.TracingIterableDelegator", "datadog.trace.instrumentation.kafka_common.Utils", "datadog.trace.instrumentation.kafka_common.StreamingContext", diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java index 3240eea74bd..2ed1a703883 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java @@ -69,8 +69,7 @@ public String[] helperClassNames() { packageName + ".rx.RedisSubscriptionDispatchAdvice", packageName + ".rx.RedisSubscriptionState", packageName + ".LettuceInstrumentationUtil", - packageName + ".LettuceClientDecorator", - packageName + ".ConnectionContextBiConsumer" + packageName + ".LettuceClientDecorator" }; } diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java index e5ae3ded856..af5f36113fa 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java @@ -47,12 +47,6 @@ public String[] helperClassNames() { return new String[] { packageName + ".AttributeKeys", packageName + ".ServerRequestContext", - // 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", diff --git a/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212Instrumentation.java b/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212Instrumentation.java index ea327e9ed2d..2bd8c6f27eb 100644 --- a/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212Instrumentation.java +++ b/dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212Instrumentation.java @@ -39,7 +39,6 @@ public String[] helperClassNames() { packageName + ".SparkLauncherListener", packageName + ".SparkSQLUtils", packageName + ".SparkSQLUtils$SparkPlanInfoForStage", - packageName + ".SparkSQLUtils$AccumulatorWithStage", packageName + ".Spark212PlanSerializer", packageName + ".Spark212PlanUtils" }; diff --git a/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213Instrumentation.java b/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213Instrumentation.java index b4e91f0c824..bbd319614b4 100644 --- a/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213Instrumentation.java +++ b/dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213Instrumentation.java @@ -39,7 +39,6 @@ public String[] helperClassNames() { packageName + ".SparkLauncherListener", packageName + ".SparkSQLUtils", packageName + ".SparkSQLUtils$SparkPlanInfoForStage", - packageName + ".SparkSQLUtils$AccumulatorWithStage", packageName + ".Spark213PlanSerializer", packageName + ".Spark213PlanUtils" }; diff --git a/dd-java-agent/instrumentation/testng/testng-6.4/src/main/java/datadog/trace/instrumentation/testng6/TestNGClassListenerInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-6.4/src/main/java/datadog/trace/instrumentation/testng6/TestNGClassListenerInstrumentation.java index a3470daf2e5..3a0ca5f0da3 100644 --- a/dd-java-agent/instrumentation/testng/testng-6.4/src/main/java/datadog/trace/instrumentation/testng6/TestNGClassListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/testng/testng-6.4/src/main/java/datadog/trace/instrumentation/testng6/TestNGClassListenerInstrumentation.java @@ -59,9 +59,7 @@ public void methodAdvice(MethodTransformer transformer) { @Override public String[] helperClassNames() { return new String[] { - commonPackageName + ".TestNGUtils", - commonPackageName + ".TestNGClassListener", - commonPackageName + ".TracingListener" + commonPackageName + ".TestNGUtils", commonPackageName + ".TestNGClassListener" }; } diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGClassListenerInstrumentation.java b/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGClassListenerInstrumentation.java index 9dd3a197d32..0989ed49195 100644 --- a/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGClassListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/testng/testng-7.0/src/main/java/datadog/trace/instrumentation/testng7/TestNGClassListenerInstrumentation.java @@ -54,9 +54,7 @@ public void methodAdvice(MethodTransformer transformer) { @Override public String[] helperClassNames() { return new String[] { - commonPackageName + ".TestNGUtils", - commonPackageName + ".TestNGClassListener", - commonPackageName + ".TracingListener" + commonPackageName + ".TestNGUtils", commonPackageName + ".TestNGClassListener" }; } diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowInstrumentation.java index ea50d58230e..b4a162bd0c2 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowInstrumentation.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowInstrumentation.java @@ -33,22 +33,6 @@ public void methodAdvice(MethodTransformer transformer) { getClass().getName() + "$DispatchAdvice"); } - @Override - public String[] helperClassNames() { - return new String[] { - packageName + ".ExchangeEndSpanListener", - packageName + ".HttpServerExchangeURIDataAdapter", - packageName + ".UndertowDecorator", - packageName + ".UndertowBlockingHandler", - packageName + ".IgnoreSendAttribute", - packageName + ".UndertowBlockResponseFunction", - packageName + ".UndertowExtractAdapter", - packageName + ".UndertowExtractAdapter$Request", - packageName + ".UndertowExtractAdapter$Response", - packageName + ".UndertowRunnableWrapper" - }; - } - public static class DispatchAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static void dispatchEnter( From 60c414371fcd62357785a9c90c0707a4ccb91fe5 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 29 Sep 2026 14:20:59 -0400 Subject: [PATCH 5/5] fourth pass --- .../graal/nativeimage/GraalNativeImageModule.java | 1 - .../instrumentation/jetty11/JettyServerInstrumentation.java | 4 ---- .../instrumentation/jetty12/JettyServerInstrumentation.java | 4 ---- .../kafka_clients38/KafkaProducerInstrumentation.java | 1 - .../karate2/KarateExecutionInstrumentation.java | 5 +---- .../trace/instrumentation/karate2/KarateInstrumentation.java | 3 +-- .../lettuce5/LettuceReactiveClientInstrumentation.java | 1 - 7 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/GraalNativeImageModule.java b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/GraalNativeImageModule.java index 71d6432347f..087288e4b76 100644 --- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/GraalNativeImageModule.java +++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/src/main/java/datadog/trace/instrumentation/graal/nativeimage/GraalNativeImageModule.java @@ -12,7 +12,6 @@ public class GraalNativeImageModule extends AbstractNativeImageModule { @Override public String[] helperClassNames() { return new String[] { - packageName + ".DeleteFieldAdvice", packageName + ".Target_com_datadog_profiling_agent_ProcessContext", packageName + ".Target_datadog_jctools_util_UnsafeRefArrayAccess", packageName + ".Target_org_datadog_jmxfetch_App", diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java index f4e244f041c..9a4c7f133d8 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java @@ -51,10 +51,6 @@ public String[] helperClassNames() { packageName + ".ExtractAdapter$Response", packageName + ".JettyDecorator", packageName + ".RequestURIDataAdapter", - packageName + ".JettyServerAdvice", - packageName + ".JettyServerAdvice$ContextTrackingAdvice", - packageName + ".JettyServerAdvice$HandleAdvice", - packageName + ".JettyServerAdvice$ResetAdvice", "datadog.trace.instrumentation.jetty.JettyBlockResponseFunction", "datadog.trace.instrumentation.jetty.JettyBlockingHelper", }; diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java index 01fead9fa0b..04a88ad1f19 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java @@ -36,10 +36,6 @@ public String[] helperClassNames() { packageName + ".ExtractAdapter$Response", packageName + ".JettyDecorator", packageName + ".RequestURIDataAdapter", - packageName + ".JettyServerAdvice", - packageName + ".JettyServerAdvice$ContextTrackingAdvice", - packageName + ".JettyServerAdvice$HandleAdvice", - packageName + ".JettyServerAdvice$ResetAdvice", packageName + ".JettyRunnableWrapper" }; } diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java index 0680c757e37..529ff7ebce8 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java @@ -48,7 +48,6 @@ public String[] helperClassNames() { "datadog.trace.instrumentation.kafka_common.KafkaConfigHelper", "datadog.trace.instrumentation.kafka_common.PendingConfig", "datadog.trace.instrumentation.kafka_common.MetadataState", - packageName + ".ProducerContextPropagationAdvice", }; } diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateExecutionInstrumentation.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateExecutionInstrumentation.java index 903335ddc85..f1329621fcb 100644 --- a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateExecutionInstrumentation.java @@ -47,10 +47,7 @@ public String[] helperClassNames() { packageName + ".KarateUtils", packageName + ".TestEventsHandlerHolder", packageName + ".ExecutionContext", - packageName + ".KarateTracingListener", - packageName + ".KarateScenarioAdvice", - packageName + ".KarateScenarioAdvice$RetryAdvice", - packageName + ".KarateScenarioAdvice$SuppressErrorAdvice" + packageName + ".KarateTracingListener" }; } diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateInstrumentation.java b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateInstrumentation.java index 522c8a464fc..c7f1abc0725 100644 --- a/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateInstrumentation.java +++ b/dd-java-agent/instrumentation/karate/karate-2.0/src/main/java/datadog/trace/instrumentation/karate2/KarateInstrumentation.java @@ -35,8 +35,7 @@ public String[] helperClassNames() { packageName + ".KarateUtils", packageName + ".TestEventsHandlerHolder", packageName + ".ExecutionContext", - packageName + ".KarateTracingListener", - packageName + ".KarateBuilderAdvice" + packageName + ".KarateTracingListener" }; } diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java index 2ed1a703883..a86c7e69e36 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java @@ -66,7 +66,6 @@ public String[] helperClassNames() { return new String[] { packageName + ".rx.RedisSubscriptionSubscribeAdvice", packageName + ".rx.RedisSubscriptionSubscribeAdvice$State", - packageName + ".rx.RedisSubscriptionDispatchAdvice", packageName + ".rx.RedisSubscriptionState", packageName + ".LettuceInstrumentationUtil", packageName + ".LettuceClientDecorator"