Addressing left-over test code review comments from PR#49639

sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/ClientMetricsTest.java

@@ -81,7 +81,7 @@ public ClientMetricsTest(CosmosClientBuilder clientBuilder) {
         super(clientBuilder);
     }
 
-    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT)
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void maxValueExceedingDefinedLimitStillWorksWithoutException() throws Exception {
 
         // Expected behavior is that higher values than the expected max value can still be recorded
@@ -129,7 +129,7 @@ public void maxValueExceedingDefinedLimitStillWorksWithoutException() throws Exc
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void createItem() throws Exception {
         boolean[] disableLatencyMeterTestCases = { false, true };
 
@@ -200,7 +200,7 @@ public void createItem() throws Exception {
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT)
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void createItemWithAllMetrics() throws Exception {
 
         boolean[] suppressConsistencyLevelTagTestCases = { false, true };
@@ -273,7 +273,7 @@ public void createItemWithAllMetrics() throws Exception {
     // Increased timeout from TIMEOUT to SETUP_TIMEOUT to account for collection creation time
     // during TestState initialization, especially in CI environments where collection creation
     // can take longer than 40 seconds
-    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT)
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void readItem() throws Exception {
         try (TestState state = new TestState(getClientBuilder(), CosmosMetricCategory.DEFAULT)) {
             InternalObjectNode properties = getDocumentDefinition(UUID.randomUUID().toString());
@@ -306,7 +306,7 @@ public void readItem() throws Exception {
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT)
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void readNonExistingItem() throws Exception {
         try (TestState state = new TestState(getClientBuilder(), CosmosMetricCategory.DEFAULT)) {
 
@@ -454,7 +454,7 @@ private void runReadItemTestWithThresholds(
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT)
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void readItemWithThresholdsApplied() throws Exception {
         CosmosDiagnosticsThresholds maxThresholds = new CosmosDiagnosticsThresholds()
             .setPointOperationLatencyThreshold(Duration.ofDays(1));
@@ -502,7 +502,7 @@ public void replaceItem() throws Exception {
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT)
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void deleteItem() throws Exception {
         try (TestState state = new TestState(getClientBuilder(), CosmosMetricCategory.DEFAULT)) {
             InternalObjectNode properties = getDocumentDefinition(UUID.randomUUID().toString());
@@ -531,7 +531,7 @@ public void deleteItem() throws Exception {
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT)
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void readAllItems() throws Exception {
         try (TestState state = new TestState(getClientBuilder(), CosmosMetricCategory.DEFAULT)) {
             InternalObjectNode properties = getDocumentDefinition(UUID.randomUUID().toString());
@@ -579,7 +579,7 @@ public void readAllItems() throws Exception {
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT)
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void readAllItemsWithDetailMetrics() throws Exception {
         try (TestState state = new TestState(getClientBuilder(), CosmosMetricCategory.DEFAULT,
             CosmosMetricCategory.OPERATION_DETAILS,
@@ -741,7 +741,7 @@ public void readAllItemsWithDetailMetricsWithExplicitPageSize() throws Exception
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT)
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void queryItems() throws Exception {
         try (TestState state = new TestState(getClientBuilder(), CosmosMetricCategory.ALL)) {
             InternalObjectNode properties = getDocumentDefinition(UUID.randomUUID().toString());
@@ -858,7 +858,10 @@ public void itemPatchSuccess() throws Exception {
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT)
+    // Increased timeout from TIMEOUT to SETUP_TIMEOUT to account for collection creation time
+    // (TestState provisions a fresh container; on multi-region accounts that create + readiness
+    // warm-up can consume most of the 40s budget before the bulk operation under test runs).
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void createItem_withBulk() throws Exception {
         try (TestState state = new TestState(getClientBuilder(), CosmosMetricCategory.DEFAULT)) {
             int totalRequest = 5;
@@ -937,7 +940,7 @@ public void createItem_withBulk() throws Exception {
         }
     }
 
-    @Test(groups = {"fast"}, timeOut = TIMEOUT)
+    @Test(groups = {"fast"}, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void batchMultipleItemExecution() throws Exception {
         try (TestState state = new TestState(getClientBuilder(), CosmosMetricCategory.DEFAULT)){
             TestDoc firstDoc = this.populateTestDoc(this.partitionKey1);
@@ -996,7 +999,7 @@ public void batchMultipleItemExecution() throws Exception {
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT * 2)
+    @Test(groups = { "fast" }, timeOut = TIMEOUT * 2, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void effectiveMetricCategoriesForDefault() throws Exception {
         try (TestState state = new TestState(getClientBuilder(), CosmosMetricCategory.fromString("DeFAult"))) {
             assertThat(state.getEffectiveMetricCategories().size()).isEqualTo(5);
@@ -1018,7 +1021,7 @@ public void effectiveMetricCategoriesForDefault() throws Exception {
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT)
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void effectiveMetricCategoriesForDefaultPlusDetails() throws Exception {
         try (TestState state = new TestState(getClientBuilder(),
             CosmosMetricCategory.DEFAULT,
@@ -1045,7 +1048,7 @@ public void effectiveMetricCategoriesForDefaultPlusDetails() throws Exception {
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT)
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void effectiveMetricCategoriesInvalidCategory() throws Exception {
         String badCategoryName = "InvalidCategory";
         try (TestState state = new TestState(getClientBuilder(),
@@ -1058,7 +1061,7 @@ public void effectiveMetricCategoriesInvalidCategory() throws Exception {
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT)
+    @Test(groups = { "fast" }, timeOut = SETUP_TIMEOUT, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void effectiveMetricCategoriesForAll() throws Exception {
         try (TestState state = new TestState(getClientBuilder(), CosmosMetricCategory.ALL)) {
 
@@ -1114,7 +1117,7 @@ public void endpointMetricsAreDurable() throws Exception {
         }
     }
 
-    @Test(groups = { "fast" }, timeOut = TIMEOUT * 2)
+    @Test(groups = { "fast" }, timeOut = TIMEOUT * 2, retryAnalyzer = FlakyTestRetryAnalyzer.class)
     public void effectiveMetricCategoriesForAllLatebound() throws Exception {
         try (TestState state = new TestState(getClientBuilder(), CosmosMetricCategory.DEFAULT)) {
             EnumSet<MetricCategory> effectiveMetricCategories =

sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/faultinjection/FaultInjectionServerErrorRuleOnDirectTests.java

@@ -707,6 +707,14 @@ public void faultInjectionServerErrorRuleTests_ServerConnectionTimeout() throws
             // Due to the replica validation, there could be an extra open connection call flow, while the rule will also be applied on.
             assertThat(serverConnectionDelayRule.getHitCount()).isBetween(1l, 2l);
             assertThat(itemResponse.getDiagnostics()).isNotNull();
+            this.validateFaultInjectionRuleApplied(
+                itemResponse.getDiagnostics(),
+                OperationType.Create,
+                HttpConstants.StatusCodes.GONE,
+                HttpConstants.SubStatusCodes.TRANSPORT_GENERATED_410,
+                ruleId,
+                true
+            );
 
         } finally {
             serverConnectionDelayRule.disable();

sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/rx/ChangeFeedTest.java

@@ -514,23 +514,33 @@ public Document updateDocument(AsyncDocumentClient client, Document originalDocu
     }
 
     public List<Document> bulkInsert(AsyncDocumentClient client, List<Document> docs) {
-        ArrayList<Mono<ResourceResponse<Document>>> result = new ArrayList<Mono<ResourceResponse<Document>>>();
+        ArrayList<Mono<Document>> result = new ArrayList<Mono<Document>>();
+        String collectionLink = "dbs/" + createdDatabase.getId() + "/colls/" + createdCollection.getId();
         for (int i = 0; i < docs.size(); i++) {
+            Document doc = docs.get(i);
             result.add(client
                 .createDocument(
-                    "dbs/" + createdDatabase.getId() + "/colls/" + createdCollection.getId(),
-                    docs.get(i),
+                    collectionLink,
+                    doc,
                     null,
                     false)
                 .retryWhen(Retry.fixedDelay(SETUP_CREATE_RETRY_ATTEMPTS, SETUP_CREATE_RETRY_DELAY)
                     .filter(ChangeFeedTest::isTransientSetupCreateFailure)
-                    .onRetryExhaustedThrow((retryBackoffSpec, retrySignal) -> retrySignal.failure())));
+                    .onRetryExhaustedThrow((retryBackoffSpec, retrySignal) -> retrySignal.failure()))
+                .map(ResourceResponse::getResource)
+                // A retried create is non-idempotent: when a create times out (e.g. 408) the initial attempt
+                // may still have succeeded on the backend, so a subsequent retry fails with 409 Conflict.
+                // Treat that as success by returning the document we tried to create (ids are unique per
+                // document, so a 409 here can only mean the prior attempt already landed).
+                .onErrorResume(
+                    ChangeFeedTest::isConflictSetupCreateFailure,
+                    error -> Mono.just(doc)));
         }
 
         return Flux.merge(
             Flux.fromIterable(result),
             100)
-                   .map(ResourceResponse::getResource).collectList().block();
+                   .collectList().block();
     }
 
     @AfterMethod(groups = { "query", "emulator" }, timeOut = SETUP_TIMEOUT)
@@ -615,6 +625,12 @@ private static boolean isTransientSetupCreateFailure(Throwable error) {
         return statusCode == 408 || statusCode == 429 || statusCode == 500 || statusCode == 503;
     }
 
+    private static boolean isConflictSetupCreateFailure(Throwable error) {
+        Throwable unwrapped = reactor.core.Exceptions.unwrap(error);
+        return unwrapped instanceof com.azure.cosmos.CosmosException
+            && ((com.azure.cosmos.CosmosException) unwrapped).getStatusCode() == 409;
+    }
+
     private static void waitAtleastASecond(Instant befTime) throws InterruptedException {
         while (befTime.plusSeconds(1).isAfter(Instant.now())) {
             Thread.sleep(100);