Tag URI for HTTP redirect responses from Jersey if route is matched (#…

…3332) Change default tag provider for Jersey to report redirect responses with the uri if a matched resource is found. Resolves gh-3327
micrometer-metrics · Aug 10, 2022 · f5f3e01 · f5f3e01
1 parent 197071c
commit f5f3e01
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...ter-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyTags.java b/...ter-core/src/main/java/io/micrometer/core/instrument/binder/jersey/server/JerseyTags.java
@@ -87,7 +87,7 @@ public static Tag uri(RequestEvent event) {
         ContainerResponse response = event.getContainerResponse();
         if (response != null) {
             int status = response.getStatus();
-            if (isRedirection(status)) {
+            if (isRedirection(status) && event.getUriInfo().getMatchedResourceMethod() == null) {
                 return URI_REDIRECTION;
             }
             if (status == 404 && event.getUriInfo().getMatchedResourceMethod() == null) {

diff --git a/...a/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTest.java b/...a/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTest.java
@@ -112,15 +112,15 @@ void notFoundIsReportedWithUriOfMatchedResource() {
     }
 
     @Test
-    void redirectsAreAccumulatedUnderSameUri() {
+    void redirectsAreReportedWithUriOfMatchedResource() {
         target("redirect/302").request().get();
         target("redirect/307").request().get();
 
-        assertThat(registry.get(METRIC_NAME).tags(tagsFrom("REDIRECTION", "302", "REDIRECTION", null)).timer().count())
-                .isEqualTo(1);
+        assertThat(registry.get(METRIC_NAME).tags(tagsFrom("/redirect/{status}", "302", "REDIRECTION", null)).timer()
+                .count()).isEqualTo(1);
 
-        assertThat(registry.get(METRIC_NAME).tags(tagsFrom("REDIRECTION", "307", "REDIRECTION", null)).timer().count())
-                .isEqualTo(1);
+        assertThat(registry.get(METRIC_NAME).tags(tagsFrom("/redirect/{status}", "307", "REDIRECTION", null)).timer()
+                .count()).isEqualTo(1);
     }
 
     @Test