Merge pull request #198 from IABTechLab/sch-UID2-4073-high-level-tests-path-normalisation-metrics

sch-UID2-4073 high level tests for path normalisation in metrics

Author: sophia-chen-ttd

pom.xml

@@ -24,7 +24,7 @@
         <vertx.verticle>com.uid2.core.vertx.CoreVerticle</vertx.verticle>
         <launcher.class>io.vertx.core.Launcher</launcher.class>
 
-        <uid2-shared.version>8.0.25</uid2-shared.version>
+        <uid2-shared.version>8.0.32</uid2-shared.version>
         <image.version>${project.version}</image.version>
     </properties>
 

src/main/java/com/uid2/core/Main.java

@@ -25,6 +25,7 @@
 import com.uid2.shared.secure.nitro.InMemoryAWSCertificateStore;
 import com.uid2.shared.store.CloudPath;
 import com.uid2.shared.store.scope.GlobalScope;
+import com.uid2.shared.util.HTTPPathMetricFilter;
 import com.uid2.shared.vertx.RotatingStoreVerticle;
 import com.uid2.shared.vertx.VertxUtils;
 import io.micrometer.core.instrument.Gauge;
@@ -187,14 +188,8 @@ private static void setupMetrics(MicrometerMetricsOptions metricOptions) {
             prometheusRegistry.config()
                     // providing common renaming for prometheus metric, e.g. "hello.world" to "hello_world"
                     .meterFilter(new PrometheusRenameFilter())
-                    .meterFilter(MeterFilter.replaceTagValues(Label.HTTP_PATH.toString(), actualPath -> {
-                        try {
-                            String normalized = HttpUtils.normalizePath(actualPath).split("\\?")[0];
-                            return Endpoints.pathSet().contains(normalized) ? normalized : "/unknown";
-                        } catch (IllegalArgumentException e) {
-                            return actualPath;
-                        }
-                    }))
+                    .meterFilter(MeterFilter.replaceTagValues(Label.HTTP_PATH.toString(),
+                            actualPath -> HTTPPathMetricFilter.filterPath(actualPath, Endpoints.pathSet())))
                     // Don't record metrics for 404s.
                     .meterFilter(MeterFilter.deny(id ->
                         id.getName().startsWith(MetricsDomain.HTTP_SERVER.getPrefix()) &&