Skip to content

Avoid duplicate context capture in OpenSearch executors #12521

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 1 commit into from
Sep 18, 2026
Merged

Avoid duplicate context capture in OpenSearch executors #12521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...dog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ public final class ThreadPoolExecutorInstrumentation
private static final ElementMatcher<MethodDescription> 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() {
Expand Down
6 changes: 0 additions & 6 deletions .../opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchTransportClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@ class OpensearchTransportClientTest extends InstrumentationSpecification {
@Shared
TransportClient client

@Override
boolean useStrictTraceWrites() {
//FIXME IDM
false
}

@Override
protected void configurePreAgent() {
super.configurePreAgent()
Expand Down
Loading