Fix #458

Author: n0tl3ss

micrometer-core/src/main/java/io/micronaut/configuration/metrics/binder/web/ServerRequestMeterRegistryFilter.java

@@ -18,17 +18,20 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micronaut.configuration.metrics.annotation.RequiresMetrics;
 import io.micronaut.context.annotation.Requires;
+import io.micronaut.http.HttpAttributes;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.MutableHttpResponse;
 import io.micronaut.http.annotation.Filter;
 import io.micronaut.http.filter.HttpServerFilter;
 import io.micronaut.http.filter.ServerFilterChain;
+import io.micronaut.http.uri.UriMatchTemplate;
+import io.micronaut.web.router.UriRoute;
+import io.micronaut.web.router.UriRouteMatch;
 import org.reactivestreams.Publisher;
 
 import java.util.Optional;
 
 import static io.micronaut.core.util.StringUtils.FALSE;
-import static io.micronaut.http.HttpAttributes.URI_TEMPLATE;
 
 /**
  * Registers the timers and meters for each request.
@@ -56,8 +59,13 @@ public ServerRequestMeterRegistryFilter(MeterRegistry meterRegistry) {
     }
 
     private String resolvePath(HttpRequest<?> request) {
-        Optional<String> route = request.getAttribute(URI_TEMPLATE, String.class);
-        return route.orElseGet(request::getPath);
+        Optional<String> routeInfo = request.getAttribute(HttpAttributes.ROUTE_INFO, UriRouteMatch.class)
+            .map(UriRouteMatch::getRoute)
+            .map(UriRoute::getUriMatchTemplate)
+            .map(UriMatchTemplate::toPathString);
+
+        return routeInfo.orElseGet(() -> request.getAttribute(HttpAttributes.URI_TEMPLATE).map(Object::toString)
+            .orElse(request.getUri().toString()));
     }
 
     /**

micrometer-core/src/test/groovy/io/micronaut/configuration/metrics/binder/web/HttpMetricsSpec.groovy

@@ -1,21 +1,32 @@
 package io.micronaut.configuration.metrics.binder.web
 
 import groovy.transform.InheritConstructors
+import io.micrometer.common.lang.NonNull
 import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.Timer
 import io.micrometer.core.instrument.distribution.HistogramSnapshot
 import io.micrometer.core.instrument.search.MeterNotFoundException
 import io.micronaut.context.ApplicationContext
+import io.micronaut.core.util.CollectionUtils
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Error
 import io.micronaut.http.annotation.Get
 import io.micronaut.http.client.annotation.Client
 import io.micronaut.http.client.exceptions.HttpClientResponseException
+import io.micronaut.http.uri.UriBuilder
 import io.micronaut.runtime.server.EmbeddedServer
+import io.micronaut.websocket.WebSocketBroadcaster
+import io.micronaut.websocket.WebSocketClient
+import io.micronaut.websocket.WebSocketSession
+import io.micronaut.websocket.annotation.*
+import org.reactivestreams.Publisher
+import reactor.core.publisher.Flux
 import spock.lang.Specification
 import spock.lang.Unroll
 
+import javax.validation.constraints.NotBlank
+
 import static io.micronaut.configuration.metrics.micrometer.MeterRegistryFactory.MICRONAUT_METRICS_BINDERS
 import static io.micronaut.configuration.metrics.micrometer.MeterRegistryFactory.MICRONAUT_METRICS_ENABLED
 import static io.micronaut.http.HttpStatus.CONFLICT
@@ -152,6 +163,36 @@ class HttpMetricsSpec extends Specification {
         (WebMetricsPublisher.ENABLED) | false
     }
 
+    void "test websocket"() {
+        when:
+        EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, [(MICRONAUT_METRICS_ENABLED): true])
+        MeterRegistry registry = embeddedServer.getApplicationContext().getBean(MeterRegistry)
+        createWebSocketClient(embeddedServer.getApplicationContext(), embeddedServer.getPort(), "Travolta")
+
+        then:
+        registry.get(WebMetricsPublisher.METRIC_HTTP_SERVER_REQUESTS).tags('uri', '/ws/{username}').timer()
+    }
+
+    @ClientWebSocket
+    static abstract class TestWebSocketClient implements AutoCloseable {
+        abstract void send(@NonNull @NotBlank String message);
+
+        @OnMessage
+        void onMessage(String message) {}
+    }
+
+
+    private TestWebSocketClient createWebSocketClient(ApplicationContext context, int port, String username) {
+        WebSocketClient webSocketClient = context.getBean(WebSocketClient.class)
+        URI uri = UriBuilder.of("ws://localhost")
+                .port(port)
+                .path("ws")
+                .path("{username}")
+                .expand(CollectionUtils.mapOf("username", username))
+        Publisher<TestWebSocketClient> client = webSocketClient.connect(TestWebSocketClient.class, uri)
+        return Flux.from(client).blockFirst()
+    }
+
     @Client('/')
     static interface TestClient {
         @Get
@@ -208,6 +249,33 @@ class HttpMetricsSpec extends Specification {
         }
     }
 
+    @ServerWebSocket("/ws/{username}")
+    static class TestWSController {
+
+        private final WebSocketBroadcaster broadcaster
+
+        @OnOpen
+        Publisher<String> onOpen(String username, WebSocketSession session) {
+            return broadcaster.broadcast(String.format("Joined %s!", username))
+        }
+
+        @OnMessage
+        Publisher<String> onMessage(
+                String username,
+                String message,
+                WebSocketSession session) {
+            return broadcaster.broadcast(String.format("[%s] %s", username, message))
+        }
+
+        @OnClose
+        Publisher<String> onClose(
+                String username,
+                WebSocketSession session) {
+            return broadcaster.broadcast(String.format("Leaving %s!", username))
+        }
+
+    }
+
     @InheritConstructors
     static class MyException extends RuntimeException {
     }