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

LikeTheSalad · SylvainJuge · web-flow · commit af23b89d2a57 · 2025-09-26T16:26:59.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/RpcInvocationHandlerInstrumentation.java b/instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/RpcInvocationHandlerInstrumentation.java
@@ -69,8 +69,7 @@ public static AdviceScope start(
         }
 
         Context context = rpcInstrumenter().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
`@@ -69,8 +69,7 @@ public static AdviceScope start(`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`Context context = rpcInstrumenter().start(parentContext, request);`
`72`		`- Scope scope = context.makeCurrent();`
`73`		`- return new AdviceScope(request, context, scope);`
	`72`	`+ return new AdviceScope(request, context, context.makeCurrent());`
`74`	`73`	`}`
`75`	`74`
`76`	`75`	`public void end(@Nullable Throwable throwable) {`