Skip to content

Commit bb0638b

Browse files
authored
Merge branch 'main' into srm-UID2-6478-version-bump-shared-for-aes-caching-optimization
2 parents 3e5eb80 + 9f38abe commit bb0638b

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.uid2</groupId>
88
<artifactId>uid2-operator</artifactId>
9-
<version>5.63.13-alpha-285-SNAPSHOT</version>
9+
<version>5.63.17</version>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

scripts/aws/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
requests[socks]==2.32.3
22
boto3==1.35.59
3-
urllib3==2.6.0
3+
urllib3==2.6.3
44
PyYAML===6.0.2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ private static void setupMetrics(MicrometerMetricsOptions metricOptions) {
517517
// providing common renaming for prometheus metric, e.g. "hello.world" to "hello_world"
518518
.meterFilter(new PrometheusRenameFilter())
519519
.meterFilter(MeterFilter.replaceTagValues(Label.HTTP_PATH.toString(),
520-
actualPath -> HTTPPathMetricFilter.filterPath(actualPath, Endpoints.pathSet())))
520+
actualPath -> HTTPPathMetricFilter.filterPathWithoutPathParameters(actualPath, Endpoints.pathSet())))
521521
// Don't record metrics for 404s.
522522
.meterFilter(MeterFilter.deny(id ->
523523
id.getName().startsWith(MetricsDomain.HTTP_SERVER.getPrefix()) &&

src/main/java/com/uid2/operator/vertx/Endpoints.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,16 @@ public enum Endpoints {
2929
UID2_SDK_1_0_0("/static/js/uid2-sdk-1.0.0.js"),
3030
UID2_SDK_2_0_0("/static/js/uid2-sdk-2.0.0.js")
3131
;
32-
private final String path;
32+
private static final Set<String> ENDPOINTS_SET = Stream.of(Endpoints.values()).map(Endpoints::toString).collect(Collectors.toSet());
33+
34+
private final String path;
3335

3436
Endpoints(final String path) {
3537
this.path = path;
3638
}
3739

3840
public static Set<String> pathSet() {
39-
return Stream.of(Endpoints.values()).map(Endpoints::toString).collect(Collectors.toSet());
41+
return ENDPOINTS_SET;
4042
}
4143

4244
@Override

0 commit comments

Comments
 (0)