feat: ✨ add support for micronaut 3

ryandens · ryandens · commit 0fb70a668c54 · 2022-01-06T11:04:05.000-05:00
diff --git a/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/NettyChannelPipelineInstrumentation.java b/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/NettyChannelPipelineInstrumentation.java
@@ -82,7 +82,7 @@ public static void addHandler(
         @Advice.Enter int callDepth,
         @Advice.This ChannelPipeline pipeline,
         @Advice.Argument(2) ChannelHandler handler) {
-      if (callDepth > 0) {
+      if (callDepth > 1) {
         return;
       }
       HypertraceCallDepthThreadLocalMap.reset(ChannelHandler.class);
diff --git a/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/NettyInstrumentationModule.java b/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/NettyInstrumentationModule.java
@@ -23,6 +23,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -47,6 +48,6 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
-    return Arrays.asList(new NettyChannelPipelineInstrumentation());
+    return Collections.singletonList(new NettyChannelPipelineInstrumentation());
   }
 }
diff --git a/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/client/HttpClientRequestTracingHandler.java b/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/client/HttpClientRequestTracingHandler.java
@@ -65,7 +65,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
 
       Map<String, String> headersMap = headersToMap(httpRequest);
       if (instrumentationConfig.httpHeaders().request()) {
-        headersMap.forEach((key, value) -> span.setAttribute(key, value));
+        headersMap.forEach(span::setAttribute);
       }
 
       CharSequence contentType = DataCaptureUtils.getContentType(httpRequest);
diff --git a/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/client/HttpClientResponseTracingHandler.java b/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/client/HttpClientResponseTracingHandler.java
@@ -104,7 +104,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
       span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.getStatus().code());
       span.setStatus(HttpStatusConverter.statusFromHttpStatus(httpResponse.getStatus().code()));
     }
-    if (msg instanceof FullHttpMessage || msg instanceof LastHttpContent) {
+    if (msg instanceof LastHttpContent) {
       span.end();
     }
   }
diff --git a/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/server/HttpServerRequestTracingHandler.java b/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/server/HttpServerRequestTracingHandler.java
@@ -61,7 +61,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
 
       Map<String, String> headersMap = headersToMap(httpRequest);
       if (instrumentationConfig.httpHeaders().request()) {
-        headersMap.forEach((key, value) -> span.setAttribute(key, value));
+        headersMap.forEach(span::setAttribute);
       }
       // used by blocking handler
       channel.attr(AttributeKeys.REQUEST_HEADERS).set(headersMap);
diff --git a/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/server/HttpServerResponseTracingHandler.java b/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/server/HttpServerResponseTracingHandler.java
@@ -101,7 +101,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
       span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.getStatus().code());
       span.setStatus(HttpStatusConverter.statusFromHttpStatus(httpResponse.getStatus().code()));
     }
-    if (msg instanceof FullHttpMessage || msg instanceof LastHttpContent) {
+    if (msg instanceof LastHttpContent) {
       span.end();
     }
   }
diff --git a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/NettyChannelPipelineInstrumentation.java b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/NettyChannelPipelineInstrumentation.java
@@ -91,7 +91,7 @@ public static void addHandler(
         @Advice.Enter int callDepth,
         @Advice.This ChannelPipeline pipeline,
         @Advice.Argument(2) ChannelHandler handler) {
-      if (callDepth > 0) {
+      if (callDepth > 1) {
         return;
       }
       HypertraceCallDepthThreadLocalMap.reset(handler.getClass());
@@ -163,21 +163,6 @@ public static void addHandler(
               HttpClientResponseTracingHandler.class.getName(),
               new HttpClientResponseTracingHandler());
         }
-        // TODO add client instrumentation
-        //        else
-        // Client pipeline handlers
-        //          if (handler instanceof HttpClientCodec) {
-        //            pipeline.addLast(
-        //                HttpClientTracingHandler.class.getName(), new HttpClientTracingHandler());
-        //          } else if (handler instanceof HttpRequestEncoder) {
-        //            pipeline.addLast(
-        //                HttpClientRequestTracingHandler.class.getName(),
-        //                new HttpClientRequestTracingHandler());
-        //          } else if (handler instanceof HttpResponseDecoder) {
-        //            pipeline.addLast(
-        //                HttpClientResponseTracingHandler.class.getName(),
-        //                new HttpClientResponseTracingHandler());
-        //          }
       } catch (IllegalArgumentException e) {
         // Prevented adding duplicate handlers.
       }
diff --git a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/NettyInstrumentationModule.java b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/NettyInstrumentationModule.java
@@ -21,7 +21,7 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -46,6 +46,6 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
-    return Arrays.asList(new NettyChannelPipelineInstrumentation());
+    return Collections.singletonList(new NettyChannelPipelineInstrumentation());
   }
 }
diff --git a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientRequestTracingHandler.java b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientRequestTracingHandler.java
@@ -64,7 +64,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
 
       Map<String, String> headersMap = headersToMap(httpRequest);
       if (instrumentationConfig.httpHeaders().request()) {
-        headersMap.forEach((key, value) -> span.setAttribute(key, value));
+        headersMap.forEach(span::setAttribute);
       }
 
       CharSequence contentType = DataCaptureUtils.getContentType(httpRequest);
diff --git a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientResponseTracingHandler.java b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientResponseTracingHandler.java
@@ -103,7 +103,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
       span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.getStatus().code());
       span.setStatus(HttpStatusConverter.statusFromHttpStatus(httpResponse.getStatus().code()));
     }
-    if (msg instanceof FullHttpMessage || msg instanceof LastHttpContent) {
+    if (msg instanceof LastHttpContent) {
       span.end();
     }
   }
diff --git a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/server/HttpServerRequestTracingHandler.java b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/server/HttpServerRequestTracingHandler.java
@@ -61,7 +61,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
 
       Map<String, String> headersMap = headersToMap(httpRequest);
       if (instrumentationConfig.httpHeaders().request()) {
-        headersMap.forEach((key, value) -> span.setAttribute(key, value));
+        headersMap.forEach(span::setAttribute);
       }
       // used by blocking handler
       channel.attr(AttributeKeys.REQUEST_HEADERS).set(headersMap);
diff --git a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/server/HttpServerResponseTracingHandler.java b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/server/HttpServerResponseTracingHandler.java
@@ -99,7 +99,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {
       span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.status().code());
       span.setStatus(HttpStatusConverter.statusFromHttpStatus(httpResponse.status().code()));
     }
-    if (msg instanceof FullHttpMessage || msg instanceof LastHttpContent) {
+    if (msg instanceof LastHttpContent) {
       span.end();
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public static void addHandler(`
`82`	`82`	`@Advice.Enter int callDepth,`
`83`	`83`	`@Advice.This ChannelPipeline pipeline,`
`84`	`84`	`@Advice.Argument(2) ChannelHandler handler) {`
`85`		`- if (callDepth > 0) {`
	`85`	`+ if (callDepth > 1) {`
`86`	`86`	`return;`
`87`	`87`	`}`
`88`	`88`	`HypertraceCallDepthThreadLocalMap.reset(ChannelHandler.class);`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;`
`24`	`24`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;`
`25`	`25`	`import java.util.Arrays;`
	`26`	`+import java.util.Collections;`
`26`	`27`	`import java.util.List;`
`27`	`28`	`import net.bytebuddy.matcher.ElementMatcher;`
`28`	`29`
`@@ -47,6 +48,6 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {`
`47`	`48`
`48`	`49`	`@Override`
`49`	`50`	`public List<TypeInstrumentation> typeInstrumentations() {`
`50`		`- return Arrays.asList(new NettyChannelPipelineInstrumentation());`
	`51`	`+ return Collections.singletonList(new NettyChannelPipelineInstrumentation());`
`51`	`52`	`}`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {`
`65`	`65`
`66`	`66`	`Map<String, String> headersMap = headersToMap(httpRequest);`
`67`	`67`	`if (instrumentationConfig.httpHeaders().request()) {`
`68`		`- headersMap.forEach((key, value) -> span.setAttribute(key, value));`
	`68`	`+ headersMap.forEach(span::setAttribute);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`CharSequence contentType = DataCaptureUtils.getContentType(httpRequest);`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {`
`104`	`104`	`span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.getStatus().code());`
`105`	`105`	`span.setStatus(HttpStatusConverter.statusFromHttpStatus(httpResponse.getStatus().code()));`
`106`	`106`	`}`
`107`		`- if (msg instanceof FullHttpMessage \|\| msg instanceof LastHttpContent) {`
	`107`	`+ if (msg instanceof LastHttpContent) {`
`108`	`108`	`span.end();`
`109`	`109`	`}`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {`
`61`	`61`
`62`	`62`	`Map<String, String> headersMap = headersToMap(httpRequest);`
`63`	`63`	`if (instrumentationConfig.httpHeaders().request()) {`
`64`		`- headersMap.forEach((key, value) -> span.setAttribute(key, value));`
	`64`	`+ headersMap.forEach(span::setAttribute);`
`65`	`65`	`}`
`66`	`66`	`// used by blocking handler`
`67`	`67`	`channel.attr(AttributeKeys.REQUEST_HEADERS).set(headersMap);`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {`
`101`	`101`	`span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.getStatus().code());`
`102`	`102`	`span.setStatus(HttpStatusConverter.statusFromHttpStatus(httpResponse.getStatus().code()));`
`103`	`103`	`}`
`104`		`- if (msg instanceof FullHttpMessage \|\| msg instanceof LastHttpContent) {`
	`104`	`+ if (msg instanceof LastHttpContent) {`
`105`	`105`	`span.end();`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`import com.google.auto.service.AutoService;`
`22`	`22`	`import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;`
`23`	`23`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;`
`24`		`-import java.util.Arrays;`
	`24`	`+import java.util.Collections;`
`25`	`25`	`import java.util.List;`
`26`	`26`	`import net.bytebuddy.matcher.ElementMatcher;`
`27`	`27`
`@@ -46,6 +46,6 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {`
`46`	`46`
`47`	`47`	`@Override`
`48`	`48`	`public List<TypeInstrumentation> typeInstrumentations() {`
`49`		`- return Arrays.asList(new NettyChannelPipelineInstrumentation());`
	`49`	`+ return Collections.singletonList(new NettyChannelPipelineInstrumentation());`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) {`
`64`	`64`
`65`	`65`	`Map<String, String> headersMap = headersToMap(httpRequest);`
`66`	`66`	`if (instrumentationConfig.httpHeaders().request()) {`
`67`		`- headersMap.forEach((key, value) -> span.setAttribute(key, value));`
	`67`	`+ headersMap.forEach(span::setAttribute);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`CharSequence contentType = DataCaptureUtils.getContentType(httpRequest);`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {`
`103`	`103`	`span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, httpResponse.getStatus().code());`
`104`	`104`	`span.setStatus(HttpStatusConverter.statusFromHttpStatus(httpResponse.getStatus().code()));`
`105`	`105`	`}`
`106`		`- if (msg instanceof FullHttpMessage \|\| msg instanceof LastHttpContent) {`
	`106`	`+ if (msg instanceof LastHttpContent) {`
`107`	`107`	`span.end();`
`108`	`108`	`}`
`109`	`109`	`}`