Resolve merge conflicts

Author: lizk886

pom.xml

@@ -6,7 +6,11 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-operator</artifactId>
+<<<<<<< HEAD
     <version>5.58.24</version>
+=======
+    <version>5.58.18-alpha-219-SNAPSHOT</version>
+>>>>>>> 1c9e1859a26788168b7a3c8bd836620815b4a087
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -22,7 +26,11 @@
         <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>
+<<<<<<< HEAD
         <uid2-shared.version>11.1.13</uid2-shared.version>
+=======
+        <uid2-shared.version>11.1.3-alpha-297-SNAPSHOT</uid2-shared.version>
+>>>>>>> 1c9e1859a26788168b7a3c8bd836620815b4a087
         <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/Main.java

@@ -402,30 +402,73 @@ private void run() throws Exception {
     }
 
     private Future<Void> createStoreVerticles() throws Exception {
+        // Time the metadata loading phase - critical S3 operations
+        metadataLoadingBeginTime = Instant.now();
+        LOGGER.info("Starting store metadata loading phase");
+        
         // load metadatas for the first time
         if (clientSideTokenGenerate) {
+            Instant start = Instant.now();
             siteProvider.getMetadata();
+            recordMetadataLoadingTime("site", start);
+            
+            start = Instant.now();
             clientSideKeypairProvider.getMetadata();
+            recordMetadataLoadingTime("client_side_keypair", start);
         }
 
         if (validateServiceLinks) {
+            Instant start = Instant.now();
             serviceProvider.getMetadata();
+            recordMetadataLoadingTime("service", start);
+            
+            start = Instant.now();
             serviceLinkProvider.getMetadata();
+            recordMetadataLoadingTime("service_link", start);
         }
 
         if (encryptedCloudFilesEnabled) {
+            Instant start = Instant.now();
             cloudEncryptionKeyProvider.getMetadata();
+            recordMetadataLoadingTime("cloud_encryption_key", start);
         }
 
+        Instant start = Instant.now();
         clientKeyProvider.getMetadata();
+        recordMetadataLoadingTime("client_key", start);
+        
+        start = Instant.now();
         keysetKeyStore.getMetadata();
+        recordMetadataLoadingTime("keyset_key", start);
+        
+        start = Instant.now();
         keysetProvider.getMetadata();
+        recordMetadataLoadingTime("keyset", start);
+        
+        start = Instant.now();
         saltProvider.getMetadata();
+        recordMetadataLoadingTime("salt", start);
+        
+        Duration totalMetadataLoadingTime = Duration.between(metadataLoadingBeginTime, Instant.now());
+        LOGGER.info("Store metadata loading phase completed in {} ms", totalMetadataLoadingTime.toMillis());
+        recordPhaseTime("store_metadata_loading", totalMetadataLoadingTime);
 
+        // Time the cloud sync setup
+        Instant cloudSyncStart = Instant.now();
+        LOGGER.info("Setting up optout cloud sync");
+        
         // create cloud sync for optout store
         OptOutCloudSync optOutCloudSync = new OptOutCloudSync(config, false);
         this.optOutStore.registerCloudSync(optOutCloudSync);
+        
+        Duration cloudSyncSetupTime = Duration.between(cloudSyncStart, Instant.now());
+        LOGGER.info("OptOut cloud sync setup completed in {} ms", cloudSyncSetupTime.toMillis());
+        recordPhaseTime("optout_cloud_sync_setup", cloudSyncSetupTime);
 
+        // Time the rotating store verticles deployment
+        Instant rotatingStoresStart = Instant.now();
+        LOGGER.info("Starting rotating store verticles deployment");
+        
         // create rotating store verticles to poll for updates
         Promise<Void> promise = Promise.promise();
         List<Future> fs = new ArrayList<>();
@@ -454,7 +497,12 @@ private Future<Void> createStoreVerticles() throws Exception {
         fs.add(createAndDeployCloudSyncStoreVerticle("optout", fsOptOut, optOutCloudSync));
         CompositeFuture.all(fs).onComplete(ar -> {
             if (ar.failed()) promise.fail(new Exception(ar.cause()));
-            else promise.complete();
+            else {
+                Duration rotatingStoresTime = Duration.between(rotatingStoresStart, Instant.now());
+                LOGGER.info("Rotating store verticles deployment completed in {} ms", rotatingStoresTime.toMillis());
+                recordPhaseTime("rotating_store_verticles_deployment", rotatingStoresTime);
+                promise.complete();
+            }
         });