Merge pull request #2293 from newrelic/micronaut-router-fixes

jtduffy · web-flow · commit 44a0f5933181 · 2025-04-02T10:23:46.000-04:00
Micronaut router fixes
diff --git a/instrumentation/micronaut-router-1.0.0/build.gradle b/instrumentation/micronaut-router-1.0.0/build.gradle
@@ -12,7 +12,7 @@ jar {
 
 verifyInstrumentation {
 
-    passesOnly('io.micronaut:micronaut-router:[2.0.0,4.0.0)')
+    passesOnly('io.micronaut:micronaut-router:[1.0.0,4.0.0)')
     excludeRegex 'io.micronaut:micronaut-router:.*(RC|M)[0-9]*$'
 }
 
diff --git a/instrumentation/micronaut-router-1.0.0/src/main/java/io/micronaut/web/router/RouteMatch_instrumentation.java b/instrumentation/micronaut-router-1.0.0/src/main/java/io/micronaut/web/router/RouteMatch_instrumentation.java
diff --git a/instrumentation/micronaut-router-4.0.0/build.gradle b/instrumentation/micronaut-router-4.0.0/build.gradle
@@ -11,7 +11,6 @@ jar {
 }
 
 verifyInstrumentation {
-
     passesOnly('io.micronaut:micronaut-router:[4.0.0,)')
     excludeRegex 'io.micronaut:micronaut-router:.*(RC|M)[0-9]*$'
 }
diff --git a/instrumentation/micronaut-router-4.0.0/src/main/java/io/micronaut/web/router/UnresolvedArgument_Instrumentation.java b/instrumentation/micronaut-router-4.0.0/src/main/java/io/micronaut/web/router/UnresolvedArgument_Instrumentation.java
@@ -0,0 +1,7 @@
+package io.micronaut.web.router;
+
+import com.newrelic.api.agent.weaver.SkipIfPresent;
+
+@SkipIfPresent(originalName = "io.micronaut.web.router.UnresolvedArgument")
+public class UnresolvedArgument_Instrumentation {
+}
diff --git a/settings.gradle b/settings.gradle
@@ -286,7 +286,7 @@ include 'instrumentation:micronaut-http-server-netty-4.6.0'
 include 'instrumentation:micronaut-http-3.0.0'
 include 'instrumentation:micronaut-http-client-2.0.0'
 include 'instrumentation:micronaut-http-client-3.0.4'
-include 'instrumentation:micronaut-router-2.0.0'
+include 'instrumentation:micronaut-router-1.0.0'
 include 'instrumentation:micronaut-router-4.0.0'
 include 'instrumentation:mongodb-async-3.4'
 include 'instrumentation:mongodb-async-3.6'

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ jar {`
`12`	`12`
`13`	`13`	`verifyInstrumentation {`
`14`	`14`
`15`		`- passesOnly('io.micronaut:micronaut-router:[2.0.0,4.0.0)')`
	`15`	`+ passesOnly('io.micronaut:micronaut-router:[1.0.0,4.0.0)')`
`16`	`16`	`excludeRegex 'io.micronaut:micronaut-router:.(RC\|M)[0-9]$'`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ jar {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`verifyInstrumentation {`
`14`		`-`
`15`	`14`	`passesOnly('io.micronaut:micronaut-router:[4.0.0,)')`
`16`	`15`	`excludeRegex 'io.micronaut:micronaut-router:.(RC\|M)[0-9]$'`
`17`	`16`	`}`