Skip to content

Centralize HTTP response customizer suppression #17617

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
laurit merged 1 commit into from
Apr 7, 2026
+15 −22
Merged

Centralize HTTP response customizer suppression #17617

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
9 changes: 2 additions & 7 deletions ...lemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerResponseTracingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.api.util.VirtualField;
import io.opentelemetry.instrumentation.netty.common.internal.NettyErrorHolder;
import io.opentelemetry.javaagent.bootstrap.ExceptionLogger;
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequest;
import org.jboss.netty.channel.Channel;
Expand Down Expand Up @@ -49,11 +48,7 @@ public void writeRequested(ChannelHandlerContext ctx, MessageEvent msg) throws E
}

private static void customizeResponse(Context context, HttpResponse response) {
try {
HttpServerResponseCustomizerHolder.getCustomizer()
.customize(context, response, NettyHttpResponseMutator.INSTANCE);
} catch (Throwable t) {
ExceptionLogger.logSuppressedError("Failed to customize Netty 3.8 HTTP server response", t);
}
HttpServerResponseCustomizerHolder.getCustomizer()
.customize(context, response, NettyHttpResponseMutator.INSTANCE);
}
}
9 changes: 2 additions & 7 deletions ...lemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerResponseTracingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.netty.common.internal.NettyErrorHolder;
import io.opentelemetry.instrumentation.netty.common.v4_0.internal.NettyCommonRequest;
import io.opentelemetry.javaagent.bootstrap.ExceptionLogger;
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
import io.opentelemetry.javaagent.instrumentation.netty.v4_0.AttributeKeys;
import javax.annotation.Nullable;
Expand Down Expand Up @@ -52,11 +51,7 @@ private static void end(Channel channel, HttpResponse response, @Nullable Throwa
}

private static void customizeResponse(Context context, HttpResponse response) {
try {
HttpServerResponseCustomizerHolder.getCustomizer()
.customize(context, response, NettyHttpResponseMutator.INSTANCE);
} catch (Throwable t) {
ExceptionLogger.logSuppressedError("Failed to customize Netty 4.0 HTTP server response", t);
}
HttpServerResponseCustomizerHolder.getCustomizer()
.customize(context, response, NettyHttpResponseMutator.INSTANCE);
}
}
9 changes: 2 additions & 7 deletions ...etry/javaagent/instrumentation/netty/v4_1/NettyHttpServerResponseBeforeCommitHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import io.netty.handler.codec.http.HttpResponse;
import io.opentelemetry.context.Context;
import io.opentelemetry.instrumentation.netty.v4_1.internal.server.HttpServerResponseBeforeCommitHandler;
import io.opentelemetry.javaagent.bootstrap.ExceptionLogger;
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;

public enum NettyHttpServerResponseBeforeCommitHandler
Expand All @@ -17,11 +16,7 @@ public enum NettyHttpServerResponseBeforeCommitHandler

@Override
public void handle(Context context, HttpResponse response) {
try {
HttpServerResponseCustomizerHolder.getCustomizer()
.customize(context, response, new NettyHttpServerResponseMutator());
} catch (Throwable t) {
ExceptionLogger.logSuppressedError("Failed to customize Netty 4.1 HTTP server response", t);
}
HttpServerResponseCustomizerHolder.getCustomizer()
.customize(context, response, new NettyHttpServerResponseMutator());
}
}
10 changes: 9 additions & 1 deletion javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import io.opentelemetry.javaagent.bootstrap.AgentClassLoader;
import io.opentelemetry.javaagent.bootstrap.BootstrapPackagePrefixesHolder;
import io.opentelemetry.javaagent.bootstrap.DefineClassHelper;
import io.opentelemetry.javaagent.bootstrap.ExceptionLogger;
import io.opentelemetry.javaagent.bootstrap.InstrumentedTaskClasses;
import io.opentelemetry.javaagent.bootstrap.LambdaTransformer;
import io.opentelemetry.javaagent.bootstrap.LambdaTransformerHolder;
Expand Down Expand Up @@ -313,7 +314,14 @@ public <T> void customize(
Context serverContext, T response, HttpServerResponseMutator<T> responseMutator) {

for (HttpServerResponseCustomizer modifier : customizers) {
modifier.customize(serverContext, response, responseMutator);
try {
modifier.customize(serverContext, response, responseMutator);
} catch (Throwable t) {
ExceptionLogger.logSuppressedError(
"Failed to customize HTTP server response with "
+ modifier.getClass().getName(),
t);
}
}
}
});
Expand Down
Loading