Skip to content

Prevent Netty idle timers from retaining request context #12503

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 16, 2026
+19 −0
Merged

Prevent Netty idle timers from retaining request context #12503

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
19 changes: 19 additions & 0 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 @@ -10,6 +10,8 @@
import static datadog.trace.instrumentation.java.concurrent.ConcurrentInstrumentationNames.EXECUTOR_INSTRUMENTATION_NAME;
import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy;
import static net.bytebuddy.matcher.ElementMatchers.isTypeInitializer;
import static net.bytebuddy.matcher.ElementMatchers.returns;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments;

import com.google.auto.service.AutoService;
Expand Down Expand Up @@ -61,6 +63,10 @@ public AsyncPropagatingDisableInstrumentation() {
"io.netty.util.concurrent.GlobalEventExecutor",
// shaded version
"io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor");
private static final ElementMatcher<TypeDescription> NETTY_IDLE_STATE_HANDLER =
namedOneOf(
"io.netty.handler.timeout.IdleStateHandler",
"io.grpc.netty.shaded.io.netty.handler.timeout.IdleStateHandler");
private static final ElementMatcher<TypeDescription> JAVA_HTTP_CLIENT =
extendsClass(named("java.net.http.HttpClient"));
private static final String LETTUCE_HANDSHAKE_HANDLER =
Expand Down Expand Up @@ -107,6 +113,8 @@ public String[] knownMatchingTypes() {
LETTUCE_HANDSHAKE_HANDLER,
"io.netty.util.concurrent.GlobalEventExecutor",
"io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor",
"io.netty.handler.timeout.IdleStateHandler",
"io.grpc.netty.shaded.io.netty.handler.timeout.IdleStateHandler",
"com.linecorp.armeria.client.HttpClientFactory",
"com.linecorp.armeria.client.HttpChannelPool"
};
Expand Down Expand Up @@ -215,6 +223,17 @@ public void methodAdvice(MethodTransformer transformer) {
isTypeInitializer().and(isDeclaredBy(RXJAVA3_DISABLED_TYPE_INITIALIZERS)), advice);
transformer.applyAdvice(
isTypeInitializer().and(isDeclaredBy(NETTY_GLOBAL_EVENT_EXECUTOR)), advice);
transformer.applyAdvice(
named("initialize")
.and(returns(void.class))
.and(
takesArgument(
0,
namedOneOf(
"io.netty.channel.ChannelHandlerContext",
"io.grpc.netty.shaded.io.netty.channel.ChannelHandlerContext")))
.and(isDeclaredBy(NETTY_IDLE_STATE_HANDLER)),
advice);
transformer.applyAdvice(namedOneOf("sendAsync").and(isDeclaredBy(JAVA_HTTP_CLIENT)), advice);
transformer.applyAdvice(
named("channelRegistered").and(isDeclaredBy(named(LETTUCE_HANDSHAKE_HANDLER))), advice);
Expand Down