simplify

Author: laurit

instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/client/HttpClientImplInstrumentation.java

@@ -11,8 +11,6 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.vertx.core.Future;
-import io.vertx.core.internal.VertxInternal;
-import io.vertx.core.internal.resource.ResourceManager;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -35,13 +33,8 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class WithResourceAsyncAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void wrapFuture(
-        @Advice.This ResourceManager<?, ?> resourceManager,
-        @Advice.Return(readOnly = false) Future<?> future) {
-      VertxInternal vertx = VertxClientSingletons.getVertx(resourceManager);
-      if (vertx != null) {
-        future = VertxClientSingletons.wrapFuture(vertx.getOrCreateContext(), future);
-      }
+    public static void wrapFuture(@Advice.Return(readOnly = false) Future<?> future) {
+      future = VertxClientSingletons.wrapFuture(future);
     }
   }
 }

instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/client/ResourceManagerInstrumentation.java

@@ -32,7 +32,6 @@ public List<TypeInstrumentation> typeInstrumentations() {
     return asList(
         new HttpRequestInstrumentation(),
         new HttpClientRequestBaseInstrumentation(),
-        new ResourceManagerInstrumentation(),
-        new HttpClientImplInstrumentation());
+        new ResourceManagerInstrumentation());
   }
 }

instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v5_0/client/VertxClientInstrumentationModule.java

@@ -11,13 +11,10 @@
 import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.instrumentation.vertx.client.VertxClientInstrumenterFactory;
 import io.vertx.core.Future;
-import io.vertx.core.Promise;
 import io.vertx.core.http.HttpClientRequest;
 import io.vertx.core.http.HttpClientResponse;
-import io.vertx.core.internal.ContextInternal;
-import io.vertx.core.internal.VertxInternal;
-import io.vertx.core.internal.resource.ResourceManager;
 import io.vertx.core.net.HostAndPort;
+import java.util.concurrent.CompletableFuture;
 
 public final class VertxClientSingletons {
 
@@ -40,31 +37,22 @@ public static HostAndPort getAuthority(HttpClientRequest request) {
     return authorityField.get(request);
   }
 
-  private static final VirtualField<ResourceManager<?, ?>, VertxInternal> vertxField =
-      VirtualField.find(ResourceManager.class, VertxInternal.class);
-
-  public static void setVertx(ResourceManager<?, ?> resourceManager, VertxInternal vertx) {
-    vertxField.set(resourceManager, vertx);
-  }
-
-  public static VertxInternal getVertx(ResourceManager<?, ?> resourceManager) {
-    return vertxField.get(resourceManager);
-  }
-
-  public static <T> Future<T> wrapFuture(ContextInternal vertxContext, Future<T> future) {
+  public static <T> Future<T> wrapFuture(Future<T> future) {
     Context context = Context.current();
-    Promise<T> promise = vertxContext.promise();
-    future.onComplete(
-        result -> {
-          try (Scope ignore = context.makeCurrent()) {
-            if (result.failed()) {
-              promise.fail(result.cause());
-            } else {
-              promise.complete(result.result());
-            }
-          }
-        });
-    return promise.future();
+    CompletableFuture<T> result = new CompletableFuture<>();
+    future
+        .toCompletionStage()
+        .whenComplete(
+            (value, throwable) -> {
+              try (Scope ignore = context.makeCurrent()) {
+                if (throwable != null) {
+                  result.completeExceptionally(throwable);
+                } else {
+                  result.complete(value);
+                }
+              }
+            });
+    return Future.fromCompletionStage(result);
   }
 
   private VertxClientSingletons() {}