Update instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/RequestHandlerInstrumentation.java

LikeTheSalad · SylvainJuge · web-flow · commit 3b6665f27e48 · 2025-09-26T16:26:52.000+02:00
Co-authored-by: SylvainJuge &lt;763082+SylvainJuge@users.noreply.github.com&gt;
diff --git a/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/RequestHandlerInstrumentation.java b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/RequestHandlerInstrumentation.java
@@ -64,8 +64,7 @@ public static AdviceScope start(Class<?> handlerClass, String methodName) {
         if (context == null) {
           return null;
         }
-        Scope scope = context.makeCurrent();
-        return new AdviceScope(request, context, scope);
+        return new AdviceScope(request, context, context.makeCurrent());
       }
 
       public void end(@Nullable Throwable throwable, boolean handled) {

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,7 @@ public static AdviceScope start(Class<?> handlerClass, String methodName) {`
`64`	`64`	`if (context == null) {`
`65`	`65`	`return null;`
`66`	`66`	`}`
`67`		`- Scope scope = context.makeCurrent();`
`68`		`- return new AdviceScope(request, context, scope);`
	`67`	`+ return new AdviceScope(request, context, context.makeCurrent());`
`69`	`68`	`}`
`70`	`69`
`71`	`70`	`public void end(@Nullable Throwable throwable, boolean handled) {`