Merge branch 'main' into swi-v2-prev-id

Author: swibi-ttd

.trivyignore

@@ -14,4 +14,8 @@ CVE-2026-1584 exp:2026-08-27
 
 # jackson-core async parser DoS - not exploitable, services only use synchronous ObjectMapper API
 # See: UID2-6670
-GHSA-72hv-8253-57qq exp:2026-09-01
+GHSA-72hv-8253-57qq exp:2026-09-01
+
+# libpng heap buffer overflow in Alpine base image - fixed version not yet available in Alpine 3.23
+# See: UID2-6677
+CVE-2026-25646 exp:2026-09-02

pom.xml

@@ -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.4.4</uid2-shared.version>
+        <uid2-shared.version>11.4.12</uid2-shared.version>
         <image.version>${project.version}</image.version>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>

src/main/java/com/uid2/operator/monitoring/OperatorMetrics.java

@@ -35,6 +35,11 @@ public void setup() {
                             .map(SaltEntry::lastUpdated).min(Long::compare).orElse(null))
                 .description("max last updated timestamp within currently effective second level salts")
                 .register(globalRegistry);
+        Gauge
+                .builder("uid2_second_level_salt_current_effective", () ->
+                        saltProvider.getSnapshot(Instant.now()).getEffective().toEpochMilli())
+                .description("effective timestamp of the currently effective second level salts")
+                .register(globalRegistry);
 
         update();
     }