Skip to content

Revert "Ignore capturing connection continuation for armeria (#11657)" #11685

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

Draft
r1viollet wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Revert "Ignore capturing connection continuation for armeria (#11657)" #11685

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
5 changes: 5 additions & 0 deletions ...instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ abstract class ArmeriaGrpcStreamingTest extends VersionedNamingTestBase {
false
}

@Override
boolean useStrictTraceWrites() {
false
}

@Override
protected void configurePreAgent() {
super.configurePreAgent()
Expand Down
5 changes: 5 additions & 0 deletions ...va-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
12 changes: 1 addition & 11 deletions ...datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 22, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Preserve the Armeria async-propagation guard

By ending knownMatchingTypes() before Armeria's HttpClientFactory/HttpChannelPool, this instrumentation no longer disables async propagation while Armeria creates its pool/connect tasks. When the first Armeria gRPC request is made under an active parent span, executor instrumentation can capture that parent into connection setup with no corresponding consumer, keeping the trace pending until the monitor flushes and allowing the strict gRPC tests to fail; the new test overrides only hide that regression. Please keep an Armeria-specific guard that avoids the shutdown crash without re-enabling these leaked continuations.

Useful? React with 👍 / 👎.

};
}

Expand Down Expand Up @@ -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 {
Expand Down
Loading