fix instrumentatoin for latest version of micronaut

vandonr · vandonr · commit a866f3408b6d · 2025-02-26T12:00:59.000+01:00
diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/src/main/java/datadog/trace/instrumentation/micronaut/v4_0/MicronautInstrumentation.java b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/src/main/java/datadog/trace/instrumentation/micronaut/v4_0/MicronautInstrumentation.java
@@ -23,6 +23,8 @@ public MicronautInstrumentation() {
   public String[] knownMatchingTypes() {
     return new String[] {
       "io.micronaut.http.server.netty.RoutingInBoundHandler",
+      // starting with 4.8.0, encodeHttpResponse methods have been moved from 👆 to 👇
+      "io.micronaut.http.server.ResponseLifecycle",
       "io.micronaut.http.server.RouteExecutor",
       "io.micronaut.http.server.netty.NettyRequestLifecycle",
     };
@@ -70,6 +72,13 @@ public void methodAdvice(MethodTransformer transformer) {
             .and(takesArgument(0, named("io.micronaut.http.server.netty.NettyHttpRequest")))
             .and(takesArgument(1, named("io.micronaut.http.HttpResponse"))),
         packageName + ".EncodeHttpResponseAdvice2");
+    // for micronaut 4.8 onwards
+    transformer.applyAdvice(
+        isMethod()
+            .and(named("encodeHttpResponse"))
+            .and(takesArgument(0, named("io.micronaut.http.HttpRequest")))
+            .and(takesArgument(1, named("io.micronaut.http.HttpResponse"))),
+        packageName + ".EncodeHttpResponseAdvice3");
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java
@@ -0,0 +1,29 @@
+package datadog.trace.instrumentation.micronaut.v4_0;
+
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
+import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.DECORATE;
+import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.SPAN_ATTRIBUTE;
+
+import datadog.trace.bootstrap.instrumentation.api.AgentScope;
+import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import io.micronaut.http.HttpRequest;
+import io.micronaut.http.HttpResponse;
+import net.bytebuddy.asm.Advice;
+
+public class EncodeHttpResponseAdvice3 {
+  @Advice.OnMethodEnter(suppress = Throwable.class)
+  public static void finishHandlerSpan(
+      @Advice.Argument(0) final HttpRequest<?> request,
+      @Advice.Argument(1) final HttpResponse<?> message) {
+    AgentSpan span = request.removeAttribute(SPAN_ATTRIBUTE, AgentSpan.class).orElse(null);
+    if (null == span) {
+      return;
+    }
+
+    try (final AgentScope scope = activateSpan(span)) {
+      DECORATE.onResponse(span, message);
+      DECORATE.beforeFinish(span);
+      span.finish();
+    }
+  }
+}
