diff --git a/Dockerfile b/Dockerfile index 7c0aa5087..a9a52548e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,4 +30,4 @@ CMD java \ -Djava.security.egd=file:/dev/./urandom \ -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.SLF4JLogDelegateFactory \ -Dlogback.configurationFile=/app/conf/logback.xml \ - -jar ${JAR_NAME}-${JAR_VERSION}.jar + -jar ${JAR_NAME}-${JAR_VERSION}.jar \ No newline at end of file diff --git a/pom.xml b/pom.xml index a3c439693..fa13e1cfc 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 2.1.0 2.1.19 2.1.9 - 11.1.124 + 11.4.0 ${project.version} 21 21 diff --git a/scripts/aws/requirements.txt b/scripts/aws/requirements.txt index fe56f20ad..21093b9c0 100644 --- a/scripts/aws/requirements.txt +++ b/scripts/aws/requirements.txt @@ -1,4 +1,4 @@ requests[socks]==2.32.3 boto3==1.35.59 -urllib3==2.6.0 +urllib3==2.6.3 PyYAML===6.0.2 \ No newline at end of file diff --git a/src/main/java/com/uid2/operator/Main.java b/src/main/java/com/uid2/operator/Main.java index 44f2fbe4a..b4e79f5c2 100644 --- a/src/main/java/com/uid2/operator/Main.java +++ b/src/main/java/com/uid2/operator/Main.java @@ -517,7 +517,7 @@ private static void setupMetrics(MicrometerMetricsOptions metricOptions) { // providing common renaming for prometheus metric, e.g. "hello.world" to "hello_world" .meterFilter(new PrometheusRenameFilter()) .meterFilter(MeterFilter.replaceTagValues(Label.HTTP_PATH.toString(), - actualPath -> HTTPPathMetricFilter.filterPath(actualPath, Endpoints.pathSet()))) + actualPath -> HTTPPathMetricFilter.filterPathWithoutPathParameters(actualPath, Endpoints.pathSet()))) // Don't record metrics for 404s. .meterFilter(MeterFilter.deny(id -> id.getName().startsWith(MetricsDomain.HTTP_SERVER.getPrefix()) && diff --git a/src/main/java/com/uid2/operator/vertx/Endpoints.java b/src/main/java/com/uid2/operator/vertx/Endpoints.java index be8fa0b05..0a9485bf7 100644 --- a/src/main/java/com/uid2/operator/vertx/Endpoints.java +++ b/src/main/java/com/uid2/operator/vertx/Endpoints.java @@ -29,14 +29,16 @@ public enum Endpoints { UID2_SDK_1_0_0("/static/js/uid2-sdk-1.0.0.js"), UID2_SDK_2_0_0("/static/js/uid2-sdk-2.0.0.js") ; - private final String path; + private static final Set ENDPOINTS_SET = Stream.of(Endpoints.values()).map(Endpoints::toString).collect(Collectors.toSet()); + + private final String path; Endpoints(final String path) { this.path = path; } public static Set pathSet() { - return Stream.of(Endpoints.values()).map(Endpoints::toString).collect(Collectors.toSet()); + return ENDPOINTS_SET; } @Override