Handled review comments

Author: joviegas

test/http-client-benchmarks/src/main/java/software/amazon/awssdk/benchmark/UnifiedBenchmarkRunner.java

@@ -15,6 +15,8 @@
 
 package software.amazon.awssdk.benchmark;
 
+import static software.amazon.awssdk.benchmark.apache5.utility.BenchmarkUtilities.isJava21OrHigher;
+
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -48,21 +50,7 @@ private static void printToConsole(String message) {
         // CHECKSTYLE:ON
     }
 
-    private static boolean isJava21OrHigher() {
 
-        String version = JavaSystemSetting.JAVA_VERSION.getStringValueOrThrow();
-        if (version.startsWith("1.")) {
-            version = version.substring(2);
-        }
-        int dotPos = version.indexOf('.');
-        int majorVersion;
-        if (dotPos != -1) {
-            majorVersion = Integer.parseInt(version.substring(0, dotPos));
-        } else {
-            majorVersion = Integer.parseInt(version);
-        }
-        return majorVersion >= 21;
-    }
 
     public static void main(String[] args) throws Exception {
         // Update logging calls to use Supplier<String> pattern

test/http-client-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apache4/Apache4Benchmark.java

@@ -56,7 +56,10 @@ public class Apache4Benchmark implements CoreBenchmark {
     @Param({"50"})
     private int maxConnections;
 
-    @Param({"20"})
+    @Param({"5"})
+    private int testDataInMB;
+
+    @Param({"10"})
     private int threadCount;
 
     private S3Client s3Client;
@@ -82,7 +85,7 @@ public void setup() {
                            .build();
 
         // Initialize benchmark implementation
-        benchmark = new S3BenchmarkImpl(s3Client);
+        benchmark = new S3BenchmarkImpl(s3Client, new byte[testDataInMB * 1024 * 1024]);
         benchmark.setup();
 
         // Platform thread pool for multi-threaded tests

test/http-client-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apache5/Apache5Benchmark.java

@@ -57,6 +57,9 @@ public class Apache5Benchmark implements CoreBenchmark {
     @Param({"50"})
     private int maxConnections;
 
+    @Param({"5"})
+    private int testDataInMB;
+
     @Param({"10"})
     private int threadCount;
 
@@ -87,7 +90,7 @@ public void setup() {
                            .build();
 
         // Initialize benchmark implementation
-        benchmark = new S3BenchmarkImpl(s3Client);
+        benchmark = new S3BenchmarkImpl(s3Client, new byte[this.testDataInMB * 1024 * 1024]);
         benchmark.setup();
 
         // Always use platform threads

test/http-client-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apache5/Apache5VirtualBenchmark.java

@@ -15,6 +15,8 @@
 
 package software.amazon.awssdk.benchmark.apache5;
 
+import static software.amazon.awssdk.benchmark.apache5.utility.BenchmarkUtilities.isJava21OrHigher;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.time.Duration;
@@ -64,13 +66,18 @@ public class Apache5VirtualBenchmark implements CoreBenchmark {
     @Param({"50"})
     private int maxConnections;
 
+    @Param({"5"})
+    private int testDataInMB;
+
     @Param({"10"})
     private int threadCount;
 
     private S3Client s3Client;
     private S3BenchmarkImpl benchmark;
     private ExecutorService executorService;
 
+
+
     @Setup(Level.Trial)
     public void setup() {
         // Verify Java version
@@ -102,7 +109,7 @@ public void setup() {
                            .build();
 
         // Initialize benchmark implementation
-        benchmark = new S3BenchmarkImpl(s3Client);
+        benchmark = new S3BenchmarkImpl(s3Client, new byte[this.testDataInMB * 1024 * 1024]);
         benchmark.setup();
 
         // Create virtual thread executor
@@ -114,21 +121,6 @@ public void setup() {
         logger.info(() -> "Apache5 virtual threads benchmark setup complete");
     }
 
-    private boolean isJava21OrHigher() {
-        String version = JavaSystemSetting.JAVA_VERSION.getStringValueOrThrow();
-        if (version.startsWith("1.")) {
-            version = version.substring(2);
-        }
-        int dotPos = version.indexOf('.');
-        int majorVersion;
-        if (dotPos != -1) {
-            majorVersion = Integer.parseInt(version.substring(0, dotPos));
-        } else {
-            majorVersion = Integer.parseInt(version);
-        }
-        return majorVersion >= 21;
-    }
-
     private ExecutorService createVirtualThreadExecutor() {
         try {
             // Use reflection to call Executors.newVirtualThreadPerTaskExecutor()

test/http-client-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apache5/utility/BenchmarkUtilities.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.benchmark.apache5.utility;
+
+import software.amazon.awssdk.utils.JavaSystemSetting;
+
+public final class BenchmarkUtilities {
+
+    private BenchmarkUtilities() {
+    }
+
+    public static boolean isJava21OrHigher() {
+        String version = JavaSystemSetting.JAVA_VERSION.getStringValueOrThrow();
+        if (version.startsWith("1.")) {
+            version = version.substring(2);
+        }
+        int dotPos = version.indexOf('.');
+        int majorVersion;
+        if (dotPos != -1) {
+            majorVersion = Integer.parseInt(version.substring(0, dotPos));
+        } else {
+            majorVersion = Integer.parseInt(version);
+        }
+        return majorVersion >= 21;
+    }
+}
+

test/http-client-benchmarks/src/main/java/software/amazon/awssdk/benchmark/core/S3BenchmarkImpl.java

@@ -49,11 +49,10 @@ public class S3BenchmarkImpl {
     private final String bucketName;
     private final byte[] testData;
 
-    public S3BenchmarkImpl(S3Client s3Client) {
+    public S3BenchmarkImpl(S3Client s3Client, byte[] testData) {
         this.s3Client = s3Client;
         this.bucketName = "benchmark-bucket-" + UUID.randomUUID().toString().substring(0, 8);
-        // 5MB test data
-        this.testData = new byte[5 * 1024 * 1024];
+        this.testData = testData;
         ThreadLocalRandom.current().nextBytes(testData);
     }