Merge pull request #49417 from brunobat/micrometer-extension-enabler

Allow other extensions to access initialPath

Author: gsmet

extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/HttpRequestMetric.java

@@ -18,10 +18,10 @@ public class HttpRequestMetric extends RequestMetricInfo {
     /** Cache of vert.x resolved paths: /item/:id --> /item/{id} */
     final static ConcurrentHashMap<String, String> vertxWebToUriTemplate = new ConcurrentHashMap<>();
 
-    protected HttpServerRequestInternal request;
-    protected String initialPath;
-    protected String templatePath;
-    protected String currentRoutePath;
+    private HttpServerRequestInternal request;
+    private String initialPath;
+    private String templatePath;
+    private String currentRoutePath;
     private final LongAdder activeRequests;
 
     private boolean requestActive = false;
@@ -44,6 +44,10 @@ public String getNormalizedUriPath(Map<Pattern, String> matchPatterns, List<Patt
         return super.getNormalizedUriPath(matchPatterns, ignorePatterns, initialPath);
     }
 
+    public String getInitialPath() {
+        return initialPath;
+    }
+
     public String applyTemplateMatching(String path) {
         // JAX-RS: UrlPathTemplate set in the
         String urlTemplatePath = getUrlTemplatePath();

extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxHttpServerMetrics.java

@@ -127,7 +127,7 @@ public HttpRequestMetric responsePushed(LongTaskTimer.Sample socketMetric, HttpM
         if (path != null) {
             pushCounter
                     .withTags(Tags.of(
-                            HttpCommonTags.uri(path, requestMetric.initialPath, response.statusCode(),
+                            HttpCommonTags.uri(path, requestMetric.getInitialPath(), response.statusCode(),
                                     config.isServerSuppress4xxErrors()),
                             VertxMetricsTags.method(method),
                             VertxMetricsTags.outcome(response),
@@ -184,7 +184,7 @@ public void requestReset(HttpRequestMetric requestMetric) {
                     sample::stop,
                     requestsTimer.withTags(Tags.of(
                             VertxMetricsTags.method(requestMetric.request().method()),
-                            HttpCommonTags.uri(path, requestMetric.initialPath, 0, false),
+                            HttpCommonTags.uri(path, requestMetric.getInitialPath(), 0, false),
                             Outcome.CLIENT_ERROR.asTag(),
                             HttpCommonTags.STATUS_RESET)),
                     requestMetric.request().context());
@@ -210,7 +210,7 @@ public void responseEnd(HttpRequestMetric requestMetric, HttpResponse response,
             Timer.Sample sample = requestMetric.getSample();
             Tags allTags = Tags.of(
                     VertxMetricsTags.method(requestMetric.request().method()),
-                    HttpCommonTags.uri(path, requestMetric.initialPath, response.statusCode(),
+                    HttpCommonTags.uri(path, requestMetric.getInitialPath(), response.statusCode(),
                             config.isServerSuppress4xxErrors()),
                     VertxMetricsTags.outcome(response),
                     HttpCommonTags.status(response.statusCode()));
@@ -249,7 +249,7 @@ public LongTaskTimer.Sample connected(LongTaskTimer.Sample sample, HttpRequestMe
                 config.getServerIgnorePatterns());
         if (path != null) {
             return websocketConnectionTimer
-                    .withTags(Tags.of(HttpCommonTags.uri(path, requestMetric.initialPath, 0, false)))
+                    .withTags(Tags.of(HttpCommonTags.uri(path, requestMetric.getInitialPath(), 0, false)))
                     .start();
         }
         return null;