From 2897ae2136be8f02ae80a54327f8c8d741a64872 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Wed, 16 Sep 2026 12:40:04 +0200 Subject: [PATCH] Avoid duplicate context capture in OpenSearch executors --- .../executor/ThreadPoolExecutorInstrumentation.java | 4 +++- .../src/test/groovy/OpensearchTransportClientTest.groovy | 6 ------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java index b7340c0f434..c5d924f67de 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java @@ -62,7 +62,9 @@ public final class ThreadPoolExecutorInstrumentation private static final ElementMatcher NO_WRAPPING_BEFORE_DELEGATION = not( isDeclaredBy( - namedOneOf("org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor"))); + namedOneOf( + "org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor", + "org.opensearch.common.util.concurrent.OpenSearchThreadPoolExecutor"))); @Override public String hierarchyMarkerType() { diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchTransportClientTest.groovy b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchTransportClientTest.groovy index 42f23f38ea2..514739078cd 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchTransportClientTest.groovy +++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchTransportClientTest.groovy @@ -35,12 +35,6 @@ class OpensearchTransportClientTest extends InstrumentationSpecification { @Shared TransportClient client - @Override - boolean useStrictTraceWrites() { - //FIXME IDM - false - } - @Override protected void configurePreAgent() { super.configurePreAgent()