Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<enclave-aws.version>2.1.0</enclave-aws.version>
<enclave-azure.version>2.1.19</enclave-azure.version>
<enclave-gcp.version>2.1.9</enclave-gcp.version>
<uid2-shared.version>11.1.124</uid2-shared.version>
<uid2-shared.version>11.4.0</uid2-shared.version>
<image.version>${project.version}</image.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
Expand Down
2 changes: 1 addition & 1 deletion scripts/aws/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/main/java/com/uid2/operator/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -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()) &&
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/uid2/operator/vertx/Endpoints.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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<String> pathSet() {
return Stream.of(Endpoints.values()).map(Endpoints::toString).collect(Collectors.toSet());
return ENDPOINTS_SET;
}

@Override
Expand Down
Loading