Revert "fixed issue where secondary benchmarks were not found"

This reverts commit b536571.

Author: joviegas

test/http-client-benchmarks/README.md

@@ -17,31 +17,11 @@ There are three ways to run benchmarks.
 # Run specific benchmark
 ```
 java -jar target/http-client-benchmarks.jar Apache5Benchmark
-
-# Run with different maxConnections values
-java -jar target/http-client-benchmarks.jar Apache4Benchmark -p maxConnections=100
-
-# Run with different threadCount values  
-java -jar target/http-client-benchmarks.jar Apache4Benchmark -p threadCount=50
-
-# Run with both parameters changed
-java -jar target/http-client-benchmarks.jar Apache4Benchmark -p maxConnections=100 -p threadCount=50
-
 ```
 
 # Run all benchmarks: 3 warm up iterations, 3 benchmark iterations, 1 fork.
 ```
 java -jar target/http-client-benchmarks.jar -wi 3 -i 3 -f 1
-
-# Test multiple connection pool sizes
-java -jar target/http-client-benchmarks.jar Apache4Benchmark -p maxConnections=25,50,100,200
-
-# Test multiple thread counts
-java -jar target/http-client-benchmarks.jar Apache4Benchmark -p threadCount=10,20,40,80
-
-# Test combinations (Cartesian product)
-java -jar target/http-client-benchmarks.jar Apache4Benchmark -p maxConnections=50,100 -p threadCount=20,40
-
 ```
 
 - Using `mvn exec:exec` commands to invoke `UnifiedBenchmarkRunner` main method

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

@@ -118,24 +118,12 @@ private static List<BenchmarkResult> runBenchmark(String clientType,
                                  benchmarkName = benchmarkName + " (" + paramInfo + ")";
                              }
 
-                             double avgLatency = 0.0;
-                             double p99Latency = 0.0;
-                             
-                             // Safely get secondary metrics if they exist
-                             if (result.getSecondaryResults().containsKey("avgLatency")) {
-                                 avgLatency = result.getSecondaryResults().get("avgLatency").getScore();
-                             }
-                             
-                             if (result.getSecondaryResults().containsKey("p99Latency")) {
-                                 p99Latency = result.getSecondaryResults().get("p99Latency").getScore();
-                             }
-                             
                              return new BenchmarkResult(
                                  clientType,
                                  benchmarkName,
                                  result.getPrimaryResult().getScore(),
-                                 avgLatency,
-                                 p99Latency,
+                                 result.getSecondaryResults().get("avgLatency").getScore(),
+                                 result.getSecondaryResults().get("p99Latency").getScore(),
                                  result.getParams().getThreads()
                              );
                          })

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

@@ -102,21 +102,18 @@ public void teardown() {
     }
 
     @Benchmark
-    @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
     public void simpleGet(Blackhole blackhole) throws Exception {
         s3Benchmark.executeGet("5MB", blackhole);
     }
 
     @Benchmark
-    @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
     public void simplePut(Blackhole blackhole) {
         s3Benchmark.executePut("5MB", blackhole);
     }
 
     @Benchmark
-    @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
     public void multiThreadedGet(Blackhole blackhole) throws Exception {
         List<Future<?>> futures = new ArrayList<>();
@@ -136,7 +133,6 @@ public void multiThreadedGet(Blackhole blackhole) throws Exception {
     }
 
     @Benchmark
-    @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
     public void multiThreadedPut(Blackhole blackhole) throws Exception {
         List<Future<?>> futures = new ArrayList<>();

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

@@ -104,21 +104,18 @@ public void teardown() {
     }
 
     @Benchmark
-    @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
     public void simpleGet(Blackhole blackhole) throws Exception {
         s3Benchmark.executeGet("5MB", blackhole);
     }
 
     @Benchmark
-    @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
     public void simplePut(Blackhole blackhole) {
         s3Benchmark.executePut("5MB", blackhole);
     }
 
     @Benchmark
-    @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
     public void multiThreadedGet(Blackhole blackhole) throws Exception {
         List<Future<?>> futures = new ArrayList<>();
@@ -138,7 +135,6 @@ public void multiThreadedGet(Blackhole blackhole) throws Exception {
     }
 
     @Benchmark
-    @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
     public void multiThreadedPut(Blackhole blackhole) throws Exception {
         List<Future<?>> futures = new ArrayList<>();

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

@@ -149,21 +149,18 @@ private ExecutorService createVirtualThreadExecutor() {
     }
 
     @Benchmark
-    @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
     public void simpleGet(Blackhole blackhole) throws Exception {
         s3Benchmark.executeGet("5MB", blackhole);
     }
 
     @Benchmark
-    @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
     public void simplePut(Blackhole blackhole) {
         s3Benchmark.executePut("5MB", blackhole);
     }
 
     @Benchmark
-    @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
     public void multiThreadedGet(Blackhole blackhole) throws Exception {
         List<Future<?>> futures = new ArrayList<>();
@@ -183,7 +180,6 @@ public void multiThreadedGet(Blackhole blackhole) throws Exception {
     }
 
     @Benchmark
-    @OutputTimeUnit(TimeUnit.SECONDS)
     @Override
     public void multiThreadedPut(Blackhole blackhole) throws Exception {
         List<Future<?>> futures = new ArrayList<>();