Merge pull request #2295 from gsidhwani-nr/main

Fixed verification failures : micronaut-http sub modules

Author: jtduffy

instrumentation/micronaut-http-3.0.0/build.gradle instrumentation/micronaut-http-1.0.0/build.gradle

@@ -13,7 +13,7 @@ jar {
 
 verifyInstrumentation {
 
-    passesOnly('io.micronaut:micronaut-http:[3.0.0,)') {
+    passesOnly('io.micronaut:micronaut-http:[1.0.0,)') {
         implementation("io.projectreactor:reactor-core:3.4.8")
     }
     excludeRegex 'io.micronaut:micronaut-http:.*(RC|M)[0-9]*$'
@@ -22,4 +22,4 @@ verifyInstrumentation {
 site {
     title 'Micronaut'
     type 'Framework'
-}
+}

instrumentation/micronaut-http-3.0.0/src/main/java/com/nr/agent/instrumentation/micronaut/http/MicronautSubresourceInstrumentation.java instrumentation/micronaut-http-1.0.0/src/main/java/com/nr/agent/instrumentation/micronaut/http/MicronautSubresourceInstrumentation.java

@@ -11,11 +11,11 @@ jar {
 }
 
 verifyInstrumentation {
-    passesOnly 'io.micronaut:micronaut-http-netty:[2.0.0,4.1.0)'
+    passesOnly 'io.micronaut:micronaut-http-netty:[1.0.0,4.1.0)'
     excludeRegex 'io.micronaut:micronaut-http-netty:.*(RC|M)[0-9]*$'
 }
 
 site {
     title 'Micronaut'
     type 'Framework'
-}
+}

instrumentation/micronaut-http-3.0.0/src/main/java/io/micronaut/http/filter/FilterChain_Instrumentation.java instrumentation/micronaut-http-1.0.0/src/main/java/io/micronaut/http/filter/FilterChain_Instrumentation.java

@@ -0,0 +1,7 @@
+package io.micronaut.http.netty.reactive;
+
+import com.newrelic.api.agent.weaver.SkipIfPresent;
+
+@SkipIfPresent(originalName = "io.micronaut.http.netty.reactive.HandlerPublisher")
+public abstract class HandlerPublisher_Instrumentation<T> {
+}

instrumentation/micronaut-http-3.0.0/src/main/java/io/micronaut/http/filter/HttpClientFilter_Instrumentation.java instrumentation/micronaut-http-1.0.0/src/main/java/io/micronaut/http/filter/HttpClientFilter_Instrumentation.java

@@ -19,4 +19,4 @@ verifyInstrumentation {
 site {
     title 'Micronaut'
     type 'Framework'
-}
+}

instrumentation/micronaut-http-3.0.0/src/main/java/io/micronaut/http/filter/HttpServerFilter_Instrumentation.java instrumentation/micronaut-http-1.0.0/src/main/java/io/micronaut/http/filter/HttpServerFilter_Instrumentation.java

@@ -0,0 +1,7 @@
+package io.micronaut.http.server.netty.binders;
+
+import com.newrelic.api.agent.weaver.SkipIfPresent;
+
+@SkipIfPresent(originalName = "io.micronaut.http.server.netty.binders.MaybeBodyBinder")
+public class MaybeBodyBinder_Instrumentation {
+}

instrumentation/micronaut-http-3.0.0/src/main/java/io/micronaut/http/uri/UriMatchTemplate_Instrumentation.java instrumentation/micronaut-http-1.0.0/src/main/java/io/micronaut/http/uri/UriMatchTemplate_Instrumentation.java

@@ -0,0 +1,8 @@
+package io.micronaut.http.server.netty.handler;
+
+import com.newrelic.api.agent.weaver.SkipIfPresent;
+
+@SkipIfPresent(originalName = "io.micronaut.http.server.netty.handler.BlockingWriter")
+class BlockingWriter_Instrumentation {
+
+}

instrumentation/micronaut-http-netty-2.0.0/build.gradle instrumentation/micronaut-http-netty-1.0.0/build.gradle

@@ -274,7 +274,7 @@ include 'instrumentation:micronaut-core-4.3.0'
 include 'instrumentation:micronaut-inject'
 include 'instrumentation:micronaut-core-reactive-2.4.0'
 include 'instrumentation:micronaut-core-reactive-3.2.0'
-include 'instrumentation:micronaut-http-netty-2.0.0'
+include 'instrumentation:micronaut-http-netty-1.0.0'
 include 'instrumentation:micronaut-http-netty-4.1.0'
 include 'instrumentation:micronaut-http-server-netty-2.0.0'
 include 'instrumentation:micronaut-http-server-netty-3.0.0'
@@ -283,7 +283,7 @@ include 'instrumentation:micronaut-http-server-netty-4.3.0'
 include 'instrumentation:micronaut-http-server-netty-4.4.0'
 include 'instrumentation:micronaut-http-server-netty-4.5.0'
 include 'instrumentation:micronaut-http-server-netty-4.6.0'
-include 'instrumentation:micronaut-http-3.0.0'
+include 'instrumentation:micronaut-http-1.0.0'
 include 'instrumentation:micronaut-http-client-2.0.0'
 include 'instrumentation:micronaut-http-client-3.0.4'
 include 'instrumentation:micronaut-router-1.0.0'