inline advice scope start

Author: SylvainJuge

instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/HttpRequestInstrumentation.java

@@ -91,11 +91,27 @@ public static class AdviceScope {
       private final Context context;
       private final Scope scope;
 
-      public AdviceScope(Context context, Scope scope) {
+      private AdviceScope(Context context, Scope scope) {
         this.context = context;
         this.scope = scope;
       }
 
+      @Nullable
+      public static AdviceScope startAndAttachContext(HttpClientRequest request) {
+        VertxRequestInfo requestInfo = REQUEST_INFO.get(request);
+        if (requestInfo == null) {
+          return null;
+        }
+
+        Context parentContext = Java8BytecodeBridge.currentContext();
+        if (!instrumenter().shouldStart(parentContext, request)) {
+          return null;
+        }
+        Context context = instrumenter().start(parentContext, request);
+        CONTEXTS.set(request, new Contexts(parentContext, context));
+        return new AdviceScope(context, context.makeCurrent());
+      }
+
       public void end(@Nullable Throwable throwable, HttpClientRequest request) {
         scope.close();
         if (throwable != null) {
@@ -107,18 +123,7 @@ public void end(@Nullable Throwable throwable, HttpClientRequest request) {
     @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static AdviceScope attachContext(@Advice.This HttpClientRequest request) {
-      VertxRequestInfo requestInfo = REQUEST_INFO.get(request);
-      if (requestInfo == null) {
-        return null;
-      }
-
-      Context parentContext = Java8BytecodeBridge.currentContext();
-      if (!instrumenter().shouldStart(parentContext, request)) {
-        return null;
-      }
-      Context context = instrumenter().start(parentContext, request);
-      CONTEXTS.set(request, new Contexts(parentContext, context));
-      return new AdviceScope(context, context.makeCurrent());
+      return AdviceScope.startAndAttachContext(request);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/client/HttpRequestInstrumentation.java

@@ -89,14 +89,28 @@ public void transform(TypeTransformer transformer) {
   public static class EndRequestAdvice {
 
     public static class AdviceScope {
-      public final Context context;
-      public final Scope scope;
+      private final Context context;
+      private final Scope scope;
 
-      public AdviceScope(Context context, Scope scope) {
+      private AdviceScope(Context context, Scope scope) {
         this.context = context;
         this.scope = scope;
       }
 
+      @Nullable
+      public static AdviceScope startAndAttachContext(HttpClientRequest request) {
+        Context parentContext = Java8BytecodeBridge.currentContext();
+        if (!instrumenter().shouldStart(parentContext, request)) {
+          return null;
+        }
+
+        Context context = instrumenter().start(parentContext, request);
+        Contexts contexts = new Contexts(parentContext, context);
+        CONTEXTS.set(request, contexts);
+
+        return new AdviceScope(context, context.makeCurrent());
+      }
+
       public void end(HttpClientRequest request, Throwable throwable) {
         scope.close();
         if (throwable != null) {
@@ -108,17 +122,7 @@ public void end(HttpClientRequest request, Throwable throwable) {
     @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static AdviceScope attachContext(@Advice.This HttpClientRequest request) {
-
-      Context parentContext = Java8BytecodeBridge.currentContext();
-      if (!instrumenter().shouldStart(parentContext, request)) {
-        return null;
-      }
-
-      Context context = instrumenter().start(parentContext, request);
-      Contexts contexts = new Contexts(parentContext, context);
-      CONTEXTS.set(request, contexts);
-
-      return new AdviceScope(context, context.makeCurrent());
+      return AdviceScope.startAndAttachContext(request);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)