[Azure-cosmos-benchmark]Refactor azure-cosmos-benchmark: move all configs from CLI to workload config JSON

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncBenchmark.java

@@ -45,7 +45,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-abstract class AsyncBenchmark<T> {
+abstract class AsyncBenchmark<T> implements Benchmark {
 
     private static final ImplementationBridgeHelpers.CosmosClientBuilderHelper.CosmosClientBuilderAccessor clientBuilderAccessor
         = ImplementationBridgeHelpers.CosmosClientBuilderHelper.getCosmosClientBuilderAccessor();
@@ -343,7 +343,7 @@ uuid, new PartitionKey(partitionKey), PojoizedJson.class)
     protected void init() {
     }
 
-    void shutdown() {
+    public void shutdown() {
         if (workloadConfig.isSuppressCleanup()) {
             logger.info("Skipping cleanup of database/container (suppressCleanup=true)");
         } else if (this.databaseCreated) {
@@ -420,7 +420,7 @@ private boolean latencyAwareOperations(Operation operation) {
         }
     }
 
-    void run() throws Exception {
+    public void run() throws Exception {
         initializeMeter();
         if (workloadConfig.getSkipWarmUpOperations() > 0) {
             logger.info("Starting warm up phase. Executing {} operations to warm up ...", workloadConfig.getSkipWarmUpOperations());

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Benchmark.java

@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.cosmos.benchmark;
+
+/**
+ * Common contract for all benchmark workloads.
+ * Implementations are created by {@link BenchmarkOrchestrator} and participate
+ * in its lifecycle loop (create → run → shutdown → settle × N cycles).
+ */
+public interface Benchmark {
+    void run() throws Exception;
+    void shutdown();
+}

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/BenchmarkConfig.java

@@ -18,7 +18,7 @@
  * Contains lifecycle params, reporting config, and fully-resolved tenant workloads.
  *
  * <p>Each {@link TenantWorkloadConfig} carries its complete effective config
- * (account info + workload params), so no separate globalDefaults map is needed.</p>
+ * (account info + workload params), so no separate tenantDefaults map is needed.</p>
  *
  * <p>When {@code cycles > 1}, sensible defaults are applied automatically
  * unless explicitly overridden (settleTimeMs=90s, suppressCleanup=true).</p>
@@ -81,44 +81,20 @@ public static BenchmarkConfig fromConfiguration(Configuration cfg) throws IOExce
         }
 
         config.gcBetweenCycles = cfg.isGcBetweenCycles();
-        config.enableJvmStats = cfg.isEnableJvmStats();
-        config.enableNettyHttpMetrics = cfg.isEnableNettyHttpMetrics();
-
-        // Reporting
-        config.reportingDirectory = cfg.getReportingDirectory() != null
-            ? cfg.getReportingDirectory().getPath() : null;
-        config.printingInterval = cfg.getPrintingInterval();
-        config.resultUploadEndpoint = cfg.getServiceEndpointForRunResultsUploadAccount();
-        config.resultUploadKey = cfg.getMasterKeyForRunResultsUploadAccount();
-        config.resultUploadDatabase = cfg.getResultUploadDatabase();
-        config.resultUploadContainer = cfg.getResultUploadContainer();
-
-        // Run metadata
-        config.testVariationName = cfg.getTestVariationName();
-        config.branchName = cfg.getBranchName();
-        config.commitId = cfg.getCommitId();
-
-        // Tenants
-        String tenantsFile = cfg.getTenantsFile();
-        if (tenantsFile != null && new File(tenantsFile).exists()) {
-            // tenants.json takes priority over CLI workload args (operation, concurrency, etc.)
-            logger.info("Loading tenant configs from {}. " +
-                "Workload parameters from tenants.json will take priority over CLI args.", tenantsFile);
-            config.tenantWorkloads = TenantWorkloadConfig.parseTenantsFile(new File(tenantsFile));
-
-            // Extract JVM-global system properties from globalDefaults
-            config.loadGlobalSystemPropertiesFromTenantsFile(new File(tenantsFile));
-        } else {
-            // Single tenant from CLI args - use fromConfiguration() to copy ALL fields
-            config.tenantWorkloads = Collections.singletonList(
-                TenantWorkloadConfig.fromConfiguration(cfg));
-
-            // JVM-global system properties from CLI
-            config.isPartitionLevelCircuitBreakerEnabled = cfg.isPartitionLevelCircuitBreakerEnabled();
-            config.isPerPartitionAutomaticFailoverRequired = cfg.isPerPartitionAutomaticFailoverRequired();
-            config.minConnectionPoolSizePerEndpoint = cfg.getMinConnectionPoolSizePerEndpoint();
+
+        // Workload config - ALWAYS from config file
+        String workloadConfigPath = cfg.getWorkloadConfig();
+        if (workloadConfigPath == null || !new File(workloadConfigPath).exists()) {
+            throw new IllegalArgumentException(
+                "A workload configuration file is required. Use -workloadConfig to specify the path."
+                + (workloadConfigPath != null ? " File not found: " + workloadConfigPath : ""));
         }
 
+        logger.info("Loading workload configs from {}.", workloadConfigPath);
+        File workloadFile = new File(workloadConfigPath);
+        config.tenantWorkloads = TenantWorkloadConfig.parseWorkloadConfig(workloadFile);
+        config.loadWorkloadConfigSections(workloadFile);
+
         return config;
     }
 
@@ -161,28 +137,106 @@ public String toString() {
     }
 
     /**
-     * Reads JVM-global system properties from the globalDefaults section of a tenants.json file.
-     * These properties are JVM-wide and cannot vary per tenant.
+     * Loads all non-tenant sections from the workload config file:
+     * JVM system properties, metrics config, result upload, and run metadata.
      */
-    private void loadGlobalSystemPropertiesFromTenantsFile(File tenantsFile) throws IOException {
+    private void loadWorkloadConfigSections(File workloadConfigFile) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
-        JsonNode root = mapper.readTree(tenantsFile);
-        JsonNode defaults = root.get("globalDefaults");
-        if (defaults == null || !defaults.isObject()) {
-            return;
+        JsonNode root = mapper.readTree(workloadConfigFile);
+
+        loadJvmSystemProperties(root);
+        loadMetricsConfig(root);
+        loadResultUploadConfig(root);
+        loadRunMetadata(root);
+    }
+
+    /**
+     * JVM-global system properties from the tenantDefaults section.
+     * These are JVM-wide and cannot vary per tenant.
+     */
+    private void loadJvmSystemProperties(JsonNode root) {
+        JsonNode defaults = root.get("tenantDefaults");
+        if (defaults != null && defaults.isObject()) {
+            if (defaults.has("isPartitionLevelCircuitBreakerEnabled")) {
+                isPartitionLevelCircuitBreakerEnabled =
+                    Boolean.parseBoolean(defaults.get("isPartitionLevelCircuitBreakerEnabled").asText());
+            }
+            if (defaults.has("isPerPartitionAutomaticFailoverRequired")) {
+                isPerPartitionAutomaticFailoverRequired =
+                    Boolean.parseBoolean(defaults.get("isPerPartitionAutomaticFailoverRequired").asText());
+            }
+            if (defaults.has("minConnectionPoolSizePerEndpoint")) {
+                minConnectionPoolSizePerEndpoint =
+                    Integer.parseInt(defaults.get("minConnectionPoolSizePerEndpoint").asText());
+            }
         }
+    }
 
-        if (defaults.has("isPartitionLevelCircuitBreakerEnabled")) {
-            isPartitionLevelCircuitBreakerEnabled =
-                Boolean.parseBoolean(defaults.get("isPartitionLevelCircuitBreakerEnabled").asText());
+    /**
+     * Metrics and reporting settings from the top-level "metrics" section.
+     */
+    private void loadMetricsConfig(JsonNode root) {
+        JsonNode metrics = root.get("metrics");
+        if (metrics != null && metrics.isObject()) {
+            if (metrics.has("enableJvmStats")) {
+                enableJvmStats = Boolean.parseBoolean(metrics.get("enableJvmStats").asText());
+            }
+            if (metrics.has("enableNettyHttpMetrics")) {
+                enableNettyHttpMetrics = Boolean.parseBoolean(metrics.get("enableNettyHttpMetrics").asText());
+            }
+            if (metrics.has("printingInterval")) {
+                printingInterval = Integer.parseInt(metrics.get("printingInterval").asText());
+            }
+            if (metrics.has("reportingDirectory")) {
+                reportingDirectory = metrics.get("reportingDirectory").asText();
+            }
         }
-        if (defaults.has("isPerPartitionAutomaticFailoverRequired")) {
-            isPerPartitionAutomaticFailoverRequired =
-                Boolean.parseBoolean(defaults.get("isPerPartitionAutomaticFailoverRequired").asText());
+    }
+
+    /**
+     * Result upload configuration from "metrics.resultUpload".
+     */
+    private void loadResultUploadConfig(JsonNode root) {
+        JsonNode metrics = root.get("metrics");
+        if (metrics == null || !metrics.isObject()) {
+            return;
+        }
+        JsonNode resultUpload = metrics.get("resultUpload");
+        if (resultUpload != null && resultUpload.isObject()) {
+            if (resultUpload.has("serviceEndpoint")) {
+                resultUploadEndpoint = resultUpload.get("serviceEndpoint").asText();
+            }
+            if (resultUpload.has("masterKey")) {
+                resultUploadKey = resultUpload.get("masterKey").asText();
+            }
+            if (resultUpload.has("database")) {
+                resultUploadDatabase = resultUpload.get("database").asText();
+            }
+            if (resultUpload.has("container")) {
+                resultUploadContainer = resultUpload.get("container").asText();
+            }
+        }
+    }
+
+    /**
+     * Run metadata from "metrics.runMetadata" (tagged on uploaded results).
+     */
+    private void loadRunMetadata(JsonNode root) {
+        JsonNode metrics = root.get("metrics");
+        if (metrics == null || !metrics.isObject()) {
+            return;
         }
-        if (defaults.has("minConnectionPoolSizePerEndpoint")) {
-            minConnectionPoolSizePerEndpoint =
-                Integer.parseInt(defaults.get("minConnectionPoolSizePerEndpoint").asText());
+        JsonNode runMetadata = metrics.get("runMetadata");
+        if (runMetadata != null && runMetadata.isObject()) {
+            if (runMetadata.has("testVariationName")) {
+                testVariationName = runMetadata.get("testVariationName").asText();
+            }
+            if (runMetadata.has("branchName")) {
+                branchName = runMetadata.get("branchName").asText();
+            }
+            if (runMetadata.has("commitId")) {
+                commitId = runMetadata.get("commitId").asText();
+            }
         }
     }
 }

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/BenchmarkHelper.java

@@ -20,10 +20,9 @@ public static PojoizedJson generateDocument(String idString, String dataFieldVal
         return instance;
     }
 
-    public static boolean shouldContinue(long startTimeMillis, long iterationCount, Configuration configuration) {
-
-        Duration maxDurationTime = configuration.getMaxRunningTimeDuration();
-        int maxNumberOfOperations = configuration.getNumberOfOperations();
+    public static boolean shouldContinue(long startTimeMillis, long iterationCount, TenantWorkloadConfig workloadConfig) {
+        Duration maxDurationTime = workloadConfig.getMaxRunningTimeDuration();
+        int maxNumberOfOperations = workloadConfig.getNumberOfOperations();
 
         if (maxDurationTime == null) {
             return iterationCount < maxNumberOfOperations;