diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerResponseTracingHandler.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerResponseTracingHandler.java index 895eb7bc4ea1..22e3200a07b6 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerResponseTracingHandler.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerResponseTracingHandler.java @@ -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; @@ -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); } } diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerResponseTracingHandler.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerResponseTracingHandler.java index 5e49442d89a2..8c52bfeabb49 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerResponseTracingHandler.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/HttpServerResponseTracingHandler.java @@ -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; @@ -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); } } diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyHttpServerResponseBeforeCommitHandler.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyHttpServerResponseBeforeCommitHandler.java index c857b8743880..a9a493dadaa7 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyHttpServerResponseBeforeCommitHandler.java +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyHttpServerResponseBeforeCommitHandler.java @@ -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 @@ -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()); } } diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java index 344a1b776d63..f55aee931645 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java @@ -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; @@ -313,7 +314,14 @@ public void customize( Context serverContext, T response, HttpServerResponseMutator 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); + } } } });