From 7c3b183294684ff29f9f8d853577dfb62e3489f7 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Tue, 19 Jan 2021 08:14:49 +0200 Subject: [PATCH] Move netty4.1 exception handling to an other method (#2070) --- .../v4_1/AbstractChannelHandlerContextInstrumentation.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AbstractChannelHandlerContextInstrumentation.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AbstractChannelHandlerContextInstrumentation.java index 7e1251126a..2f2ca72f77 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AbstractChannelHandlerContextInstrumentation.java +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AbstractChannelHandlerContextInstrumentation.java @@ -31,13 +31,13 @@ public class AbstractChannelHandlerContextInstrumentation implements TypeInstrum public Map, String> transformers() { return singletonMap( isMethod() - .and(named("notifyHandlerException")) + .and(named("invokeExceptionCaught")) .and(takesArgument(0, named(Throwable.class.getName()))), AbstractChannelHandlerContextInstrumentation.class.getName() - + "$NotifyHandlerExceptionAdvice"); + + "$InvokeExceptionCaughtAdvice"); } - public static class NotifyHandlerExceptionAdvice { + public static class InvokeExceptionCaughtAdvice { @Advice.OnMethodEnter public static void onEnter(@Advice.Argument(0) Throwable throwable) { Span span = Java8BytecodeBridge.currentSpan();