From 23d65d61b999984e48899216f35477c299d07d44 Mon Sep 17 00:00:00 2001 From: Erwan Viollet Date: Sat, 20 Jun 2026 23:57:07 +0200 Subject: [PATCH] Revert "Ignore capturing connection continuation for armeria (#11657)" This reverts commit 0e13e90dacf7c1270a92d01ee4a4f82e9d6230c6. --- .../src/test/groovy/ArmeriaGrpcStreamingTest.groovy | 5 +++++ .../src/test/groovy/ArmeriaGrpcTest.groovy | 5 +++++ .../AsyncPropagatingDisableInstrumentation.java | 12 +----------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy index 912fa60e0ed..4098f3d4f62 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy @@ -41,6 +41,11 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase { false } + @Override + boolean useStrictTraceWrites() { + false + } + @Override protected void configurePreAgent() { super.configurePreAgent() diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy index 7f8089f9aa9..da2fd3e2510 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy @@ -87,6 +87,11 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase { injectSysConfig(GRPC_SERVER_ERROR_STATUSES, "2-14", true) } + @Override + boolean useStrictTraceWrites() { + false + } + def setupSpec() { ig = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC) } diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java index 94c94573032..f7baa6fd6b0 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java @@ -93,9 +93,7 @@ public String[] knownMatchingTypes() { "jdk.internal.net.http.HttpClientImpl", LETTUCE_HANDSHAKE_HANDLER, "io.netty.util.concurrent.GlobalEventExecutor", - "io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor", - "com.linecorp.armeria.client.HttpClientFactory", - "com.linecorp.armeria.client.HttpChannelPool" + "io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor" }; } @@ -201,14 +199,6 @@ public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice(namedOneOf("sendAsync").and(isDeclaredBy(JAVA_HTTP_CLIENT)), advice); transformer.applyAdvice( named("channelRegistered").and(isDeclaredBy(named(LETTUCE_HANDSHAKE_HANDLER))), advice); - // armeria runs its own codec/pipeline, so the active request span captured during connection - // pool creation and channel connect will have no consumers. - transformer.applyAdvice( - named("pool").and(isDeclaredBy(named("com.linecorp.armeria.client.HttpClientFactory"))), - advice); - transformer.applyAdvice( - named("connect").and(isDeclaredBy(named("com.linecorp.armeria.client.HttpChannelPool"))), - advice); } public static class DisableAsyncAdvice {