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

LikeTheSalad · SylvainJuge · web-flow · commit a4547c48723c · 2025-09-26T16:26:45.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/ClientCallableRpcInstrumentation.java b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/ClientCallableRpcInstrumentation.java
@@ -62,8 +62,7 @@ public static AdviceScope start(Class<?> componentClass, String methodName) {
         }
 
         Context context = clientCallableInstrumenter().start(parentContext, request);
-        Scope scope = context.makeCurrent();
-        return new AdviceScope(request, context, scope);
+        return new AdviceScope(request, context, context.makeCurrent());
       }
 
       public void end(@Nullable Throwable throwable) {

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,7 @@ public static AdviceScope start(Class<?> componentClass, String methodName) {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`Context context = clientCallableInstrumenter().start(parentContext, request);`
`65`		`- Scope scope = context.makeCurrent();`
`66`		`- return new AdviceScope(request, context, scope);`
	`65`	`+ return new AdviceScope(request, context, context.makeCurrent());`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`public void end(@Nullable Throwable throwable) {`