Trace DNS resolution in reactor-netty (#4627)

* Trace DNS resolution in reactor-netty

* Code review comments

* removed a little too much

* implementation -> api

* revert and make muzzle happy

instrumentation/netty/netty-4.1-common/javaagent/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+  id("otel.javaagent-instrumentation")
+}
+
+dependencies {
+  api(project(":instrumentation:netty:netty-4-common:javaagent"))
+
+  compileOnly("io.netty:netty-codec-http:4.1.0.Final")
+}

instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AttributeKeys.java → instrumentation/netty/netty-4.1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AttributeKeys.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.netty.v4_1;
+package io.opentelemetry.javaagent.instrumentation.netty.v4_1;
 
 import io.netty.util.AttributeKey;
 import io.opentelemetry.context.Context;

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/InstrumentedAddressResolverGroup.java → instrumentation/netty/netty-4.1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/InstrumentedAddressResolverGroup.java

@@ -3,9 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.netty.v4_1.client;
-
-import static io.opentelemetry.javaagent.instrumentation.netty.v4_1.client.NettyClientSingletons.connectionInstrumenter;
+package io.opentelemetry.javaagent.instrumentation.netty.v4_1;
 
 import io.netty.resolver.AddressResolver;
 import io.netty.resolver.AddressResolverGroup;
@@ -27,7 +25,7 @@ public static <T extends SocketAddress> AddressResolverGroup<T> wrap(
     if (delegate instanceof InstrumentedAddressResolverGroup) {
       return delegate;
     }
-    return new InstrumentedAddressResolverGroup<>(connectionInstrumenter(), delegate);
+    return new InstrumentedAddressResolverGroup<>(instrumenter, delegate);
   }
 
   private final NettyConnectionInstrumenter instrumenter;

instrumentation/netty/netty-4.1/javaagent/build.gradle.kts

@@ -25,8 +25,7 @@ muzzle {
 
 dependencies {
   library("io.netty:netty-codec-http:4.1.0.Final")
-  api(project(":instrumentation:netty:netty-4.1:library"))
-  implementation(project(":instrumentation:netty:netty-4-common:javaagent"))
+  api(project(":instrumentation:netty:netty-4.1-common:javaagent"))
 
   testInstrumentation(project(":instrumentation:netty:netty-3.8:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AbstractChannelHandlerContextInstrumentation.java

@@ -13,7 +13,6 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.util.Attribute;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.netty.common.HttpRequestAndChannel;

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/BootstrapInstrumentation.java

@@ -22,7 +22,6 @@
 import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.instrumentation.netty.common.NettyConnectionRequest;
 import io.opentelemetry.javaagent.instrumentation.netty.common.client.ConnectionCompleteListener;
-import io.opentelemetry.javaagent.instrumentation.netty.v4_1.client.InstrumentedAddressResolverGroup;
 import java.net.SocketAddress;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
@@ -84,7 +83,6 @@ public static void startConnect(
 
       Context parentContext = Java8BytecodeBridge.currentContext();
       request = NettyConnectionRequest.connect(remoteAddress);
-
       if (!connectionInstrumenter().shouldStart(parentContext, request)) {
         return;
       }

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/ChannelInstrumentation.java

@@ -12,7 +12,6 @@
 import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
 
 import io.netty.channel.Channel;
-import io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge;

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/HttpClientRequestTracingHandler.java

@@ -15,8 +15,8 @@
 import io.netty.util.Attribute;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys;
 import io.opentelemetry.javaagent.instrumentation.netty.common.HttpRequestAndChannel;
+import io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys;
 
 public class HttpClientRequestTracingHandler extends ChannelOutboundHandlerAdapter {
 

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/HttpClientResponseTracingHandler.java

@@ -16,8 +16,8 @@
 import io.netty.util.Attribute;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys;
 import io.opentelemetry.javaagent.instrumentation.netty.common.HttpRequestAndChannel;
+import io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys;
 
 public class HttpClientResponseTracingHandler extends ChannelInboundHandlerAdapter {
 

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/HttpServerRequestTracingHandler.java

@@ -14,8 +14,8 @@
 import io.netty.util.Attribute;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys;
 import io.opentelemetry.javaagent.instrumentation.netty.common.HttpRequestAndChannel;
+import io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys;
 
 public class HttpServerRequestTracingHandler extends ChannelInboundHandlerAdapter {
 

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/HttpServerResponseTracingHandler.java

@@ -18,9 +18,9 @@
 import io.netty.util.Attribute;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys;
 import io.opentelemetry.javaagent.instrumentation.netty.common.HttpRequestAndChannel;
 import io.opentelemetry.javaagent.instrumentation.netty.common.NettyErrorHolder;
+import io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys;
 import javax.annotation.Nullable;
 
 public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdapter {

instrumentation/ratpack-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/TracingHandler.java

@@ -11,8 +11,8 @@
 
 import io.netty.util.Attribute;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys;
 import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge;
+import io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys;
 import ratpack.handling.Context;
 import ratpack.handling.Handler;
 

instrumentation/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts

@@ -16,7 +16,7 @@ muzzle {
 }
 
 dependencies {
-  implementation(project(":instrumentation:netty:netty-4.1:library"))
+  implementation(project(":instrumentation:netty:netty-4.1-common:javaagent"))
   library("io.projectreactor.netty:reactor-netty:0.9.0.RELEASE")
 
   testInstrumentation(project(":instrumentation:reactor-netty:reactor-netty-1.0:javaagent"))

instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/DecoratorFunctions.java

@@ -8,7 +8,7 @@
 import io.netty.channel.Channel;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys;
+import io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys;
 import java.util.function.BiConsumer;
 import javax.annotation.Nullable;
 import reactor.netty.Connection;

instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/OnRequest.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.reactornetty.v0_9;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys;
+import io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys;
 import java.util.function.BiConsumer;
 import reactor.netty.Connection;
 import reactor.netty.http.client.HttpClientRequest;

instrumentation/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts

@@ -17,8 +17,10 @@ muzzle {
 }
 
 dependencies {
-  implementation(project(":instrumentation:netty:netty-4.1:library"))
-  implementation(project(":instrumentation:netty:netty-4-common:javaagent"))
+  compileOnly("com.google.auto.value:auto-value-annotations")
+  annotationProcessor("com.google.auto.value:auto-value")
+
+  implementation(project(":instrumentation:netty:netty-4.1-common:javaagent"))
   library("io.projectreactor.netty:reactor-netty-http:1.0.0")
 
   testInstrumentation(project(":instrumentation:reactor-netty:reactor-netty-0.9:javaagent"))

instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ConnectionRequestAndContext.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.reactornetty.v1_0;
+
+import com.google.auto.value.AutoValue;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.javaagent.instrumentation.netty.common.NettyConnectionRequest;
+
+@AutoValue
+public abstract class ConnectionRequestAndContext {
+
+  public static ConnectionRequestAndContext create(
+      NettyConnectionRequest request, Context context) {
+    return new AutoValue_ConnectionRequestAndContext(request, context);
+  }
+
+  public abstract NettyConnectionRequest request();
+
+  public abstract Context context();
+}

instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/ConnectionWrapper.java

@@ -8,15 +8,37 @@
 import static io.opentelemetry.javaagent.instrumentation.reactornetty.v1_0.ReactorNettySingletons.connectionInstrumenter;
 
 import io.netty.channel.Channel;
-import io.opentelemetry.context.Context;
-import io.opentelemetry.javaagent.instrumentation.netty.common.NettyConnectionRequest;
+import io.netty.channel.ChannelPromise;
+import io.opentelemetry.instrumentation.api.field.VirtualField;
+import javax.annotation.Nullable;
 import reactor.core.publisher.Mono;
 
-public class ConnectionWrapper {
+public final class ConnectionWrapper {
 
-  public static Mono<Channel> wrap(
-      Context context, NettyConnectionRequest request, Mono<Channel> mono) {
-    return mono.doOnError(error -> connectionInstrumenter().end(context, request, null, error))
-        .doOnSuccess(channel -> connectionInstrumenter().end(context, request, channel, null));
+  private static final VirtualField<ChannelPromise, ConnectionRequestAndContext>
+      requestAndContextField =
+          VirtualField.find(ChannelPromise.class, ConnectionRequestAndContext.class);
+
+  public static Mono<Channel> wrap(Mono<Channel> mono) {
+    // if we didn't attach the connection context&request then we have nothing to instrument
+    if (!(mono instanceof ChannelPromise)) {
+      return mono;
+    }
+    return mono.doOnError(error -> end(mono, null, error))
+        .doOnSuccess(channel -> end(mono, channel, null))
+        .doOnCancel(() -> end(mono, null, null));
+  }
+
+  private static void end(
+      Mono<Channel> mono, @Nullable Channel channel, @Nullable Throwable error) {
+    ConnectionRequestAndContext requestAndContext =
+        requestAndContextField.get((ChannelPromise) mono);
+    if (requestAndContext == null) {
+      return;
+    }
+    connectionInstrumenter()
+        .end(requestAndContext.context(), requestAndContext.request(), channel, error);
   }
+
+  private ConnectionWrapper() {}
 }

instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/DecoratorFunctions.java

@@ -8,7 +8,7 @@
 import io.netty.channel.Channel;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys;
+import io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys;
 import java.util.function.BiConsumer;
 import javax.annotation.Nullable;
 import reactor.netty.Connection;

instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/OnRequest.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.reactornetty.v1_0;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys;
+import io.opentelemetry.javaagent.instrumentation.netty.v4_1.AttributeKeys;
 import java.util.function.BiConsumer;
 import reactor.netty.Connection;
 import reactor.netty.http.client.HttpClientRequest;