Merged main

Author: gmsdelmundo

.github/actions/update_operator_version/action.yaml

@@ -43,7 +43,7 @@ runs:
       uses: trstringer/manual-approval@v1
       with:
         secret: ${{ github.token }}
-        approvers: atarassov-ttd,vishalegbert-ttd,sunnywu,cody-constine-ttd
+        approvers: atarassov-ttd,vishalegbert-ttd,sunnywu,clarkxuyang
         minimum-approvals: 1
         issue-title: Creating Major version of UID2-Operator
 

.github/workflows/publish-all-operators.yaml

@@ -46,7 +46,7 @@ jobs:
         uses: trstringer/manual-approval@v1
         with:
           secret: ${{ github.token }}
-          approvers: atarassov-ttd,vishalegbert-ttd,sunnywu,cody-constine-ttd
+          approvers: atarassov-ttd,vishalegbert-ttd,sunnywu,clarkxuyang
           minimum-approvals: 1
           issue-title: Creating Major version of UID2-Operator
 

.github/workflows/publish-public-operator-docker-image.yaml

@@ -53,7 +53,7 @@ jobs:
         uses: trstringer/manual-approval@v1
         with:
           secret: ${{ github.token }}
-          approvers: atarassov-ttd,vishalegbert-ttd,sunnywu,cody-constine-ttd
+          approvers: atarassov-ttd,vishalegbert-ttd,sunnywu,clarkxuyang
           minimum-approvals: 1
           issue-title: Creating Major version of UID2-Operator
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-operator</artifactId>
-    <version>5.58.10-alpha-222-SNAPSHOT</version>
+    <version>5.58.37</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -22,7 +22,7 @@
         <enclave-aws.version>2.1.0</enclave-aws.version>
         <enclave-azure.version>2.1.13</enclave-azure.version>
         <enclave-gcp.version>2.1.0</enclave-gcp.version>
-        <uid2-shared.version>11.0.4</uid2-shared.version>
+        <uid2-shared.version>11.1.62</uid2-shared.version>
         <image.version>${project.version}</image.version>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
@@ -169,11 +169,6 @@
             <version>8.0</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-s3</artifactId>
-            <version>1.12.701</version>
-        </dependency>
         <dependency>
             <groupId>com.iabtcf</groupId>
             <artifactId>iabtcf-decoder</artifactId>

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

@@ -36,6 +36,7 @@
 import com.uid2.shared.health.PodTerminationMonitor;
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.Timer;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.config.MeterFilter;
@@ -68,6 +69,7 @@
 public class Main {
     private static final Logger LOGGER = LoggerFactory.getLogger(Main.class);
 
+    private static volatile Instant startupBeginTime;
     private final JsonObject config;
     private final Vertx vertx;
     private final ApplicationVersion appVersion;
@@ -244,7 +246,15 @@ private KeyManager getKeyManager() {
         return new KeyManager(this.keysetKeyStore, this.keysetProvider);
     }
 
+    public static void recordStartupComplete() {
+        if (startupBeginTime == null) return;
+        final Duration d = Duration.between(startupBeginTime, Instant.now());
+        Timer.builder("uid2_operator_startup_duration").register(globalRegistry).record(d);
+        LOGGER.info("Startup in {} ms", d.toMillis());
+    }
+
     public static void main(String[] args) throws Exception {
+        startupBeginTime = Instant.now();
 
         java.security.Security.setProperty("networkaddress.cache.ttl" , "60");
 

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

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.uid2.operator.Const;
+import com.uid2.operator.Main;
 import com.uid2.operator.model.*;
 import com.uid2.operator.model.IdentityScope;
 import com.uid2.operator.monitoring.IStatsCollectorQueue;
@@ -115,6 +116,7 @@ public class UIDOperatorVerticle extends AbstractVerticle {
     private final Map<String, Counter> _tokenGenerateTCFUsage = new HashMap<>();
     private final Map<String, Tuple.Tuple2<Counter, Counter>> _identityMapUnmappedIdentifiers = new HashMap<>();
     private final Map<String, Counter> _identityMapRequestWithUnmapped = new HashMap<>();
+    private final Map<Tuple.Tuple2<String, String>, Counter> _clientVersions = new HashMap<>();
 
     private final Map<String, DistributionSummary> optOutStatusCounters = new HashMap<>();
     private final IdentityScope identityScope;
@@ -218,6 +220,8 @@ public void start(Promise<Void> startPromise) throws Exception {
                 .listen(port, result -> {
                     if (result.succeeded()) {
                         this.healthComponent.setHealthStatus(true);
+                        // Record startup completion now that HTTP server is ready
+                        Main.recordStartupComplete();
                         startPromise.complete();
                     } else {
                         this.healthComponent.setHealthStatus(false, result.cause().getMessage());
@@ -788,12 +792,11 @@ private void handleHealthCheck(RoutingContext rc) {
         }
     }
 
-    private static final Map<Tuple.Tuple2<String, String>, Counter> CLIENT_VERSION_COUNTERS = new HashMap<>();
     private void recordOperatorServedSdkUsage(RoutingContext rc, Integer siteId, String apiContact, String clientVersion) {
         if (siteId != null && apiContact != null && clientVersion != null) {
             final String path = RoutingContextUtil.getPath(rc);
 
-            CLIENT_VERSION_COUNTERS.computeIfAbsent(
+            _clientVersions.computeIfAbsent(
                     new Tuple.Tuple2<>(Integer.toString(siteId), clientVersion),
                     tuple -> Counter
                             .builder("uid2_client_sdk_versions_total")