migrate last bit to indy

Author: SylvainJuge

instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/ConnectionInstrumentation.java

@@ -26,6 +26,7 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.util.Locale;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -68,35 +69,50 @@ public static void addDbInfo(
   @SuppressWarnings("unused")
   public static class TransactionAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This Connection connection,
-        @Advice.Origin("#m") String methodName,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      Context parentContext = currentContext();
-      DbRequest request =
-          DbRequest.createTransaction(connection, methodName.toUpperCase(Locale.ROOT));
-
-      if (request == null || !transactionInstrumenter().shouldStart(parentContext, request)) {
-        return;
+    public static final class AdviceScope {
+      private final DbRequest request;
+      private final Context context;
+      private final Scope scope;
+
+      private AdviceScope(DbRequest request, Context context, Scope scope) {
+        this.request = request;
+        this.context = context;
+        this.scope = scope;
+      }
+
+      @Nullable
+      public static AdviceScope start(Connection connection, String methodName) {
+        DbRequest request =
+            DbRequest.createTransaction(connection, methodName.toUpperCase(Locale.ROOT));
+        if (request == null) {
+          return null;
+        }
+        Context parentContext = currentContext();
+        if (!transactionInstrumenter().shouldStart(parentContext, request)) {
+          return null;
+        }
+
+        Context context = transactionInstrumenter().start(parentContext, request);
+        return new AdviceScope(request, context, context.makeCurrent());
       }
 
-      context = transactionInstrumenter().start(parentContext, request);
-      scope = context.makeCurrent();
+      public void end(@Nullable Throwable throwable) {
+        scope.close();
+        transactionInstrumenter().end(context, request, null, throwable);
+      }
+    }
+
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AdviceScope onEnter(
+        @Advice.This Connection connection, @Advice.Origin("#m") String methodName) {
+      return AdviceScope.start(connection, methodName);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelRequest") DbRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      if (scope == null) {
-        return;
-      }
-      scope.close();
-      transactionInstrumenter().end(context, request, null, throwable);
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
+      if (adviceScope != null) adviceScope.end(throwable);
     }
   }
 }