Revert "fixed checksyle issues"

This reverts commit 99e697e.

Author: joviegas

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

@@ -15,9 +15,7 @@
 
 package software.amazon.awssdk.benchmark.apache4;
 
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
+
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -36,13 +34,18 @@
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.awssdk.benchmark.core.CoreBenchmark;
 import software.amazon.awssdk.benchmark.core.S3BenchmarkImpl;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.apache.ApacheHttpClient;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.utils.Logger;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
 
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.SECONDS)
@@ -51,7 +54,7 @@
 @Warmup(iterations = 3, time = 15, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 5, time = 10, timeUnit = TimeUnit.SECONDS)
 public class Apache4Benchmark implements CoreBenchmark {
-    private static final Logger logger = Logger.loggerFor(Apache4Benchmark.class);
+    private static final Logger logger = Logger.getLogger(Apache4Benchmark.class.getName());
 
     @Param({"50"})
     private int maxConnections;
@@ -60,88 +63,114 @@ public class Apache4Benchmark implements CoreBenchmark {
     private int threadCount;
 
     private S3Client s3Client;
-    private S3BenchmarkImpl s3Benchmark;
-    private ExecutorService executor;
+    private S3BenchmarkImpl benchmark;
+    private ExecutorService platformThreadPool;
 
     @Setup(Level.Trial)
     public void setup() {
-        logger.info(() -> "Setting up Apache4 benchmark with " + threadCount + " threads");
+        logger.info("Setting up Apache4 benchmark with maxConnections=" + maxConnections);
 
+        // Apache 4 HTTP client
         SdkHttpClient httpClient = ApacheHttpClient.builder()
+                                                   .maxConnections(maxConnections)
                                                    .connectionTimeout(Duration.ofSeconds(10))
                                                    .socketTimeout(Duration.ofSeconds(30))
                                                    .connectionAcquisitionTimeout(Duration.ofSeconds(10))
-                                                   .maxConnections(maxConnections)
+                                                   .connectionMaxIdleTime(Duration.ofSeconds(60))
+                                                   .connectionTimeToLive(Duration.ofMinutes(5))
+                                                   .useIdleConnectionReaper(true)
                                                    .build();
 
+        // S3 client
         s3Client = S3Client.builder()
                            .region(Region.US_WEST_2)
+                           .credentialsProvider(DefaultCredentialsProvider.create())
                            .httpClient(httpClient)
                            .build();
 
-        s3Benchmark = new S3BenchmarkImpl(s3Client);
-        s3Benchmark.setup();
+        // Initialize benchmark implementation
+        benchmark = new S3BenchmarkImpl(s3Client);
+        benchmark.setup();
 
-        executor = Executors.newFixedThreadPool(threadCount);
-    }
+        // Platform thread pool for multi-threaded tests
+        platformThreadPool = Executors.newFixedThreadPool(threadCount, r -> {
+            Thread t = new Thread(r);
+            t.setName("apache4-platform-worker-" + t.getId());
+            return t;
+        });
 
-    @TearDown(Level.Trial)
-    public void teardown() {
-        logger.info(() -> "Tearing down Apache4 benchmark");
-        s3Benchmark.cleanup();
-        s3Client.close();
-        executor.shutdown();
-        try {
-            if (!executor.awaitTermination(10, TimeUnit.SECONDS)) {
-                executor.shutdownNow();
-            }
-        } catch (InterruptedException e) {
-            executor.shutdownNow();
-            Thread.currentThread().interrupt();
-        }
+        logger.info("Apache4 benchmark setup complete");
     }
 
     @Benchmark
     @Override
     public void simpleGet(Blackhole blackhole) throws Exception {
-        s3Benchmark.executeGet("5MB", blackhole);
+        benchmark.executeGet("medium", blackhole);
     }
 
     @Benchmark
     @Override
-    public void simplePut(Blackhole blackhole) {
-        s3Benchmark.executePut("5MB", blackhole);
+    public void simplePut(Blackhole blackhole) throws Exception {
+        benchmark.executePut("medium", blackhole);
     }
 
     @Benchmark
     @Override
     public void multiThreadedGet(Blackhole blackhole) throws Exception {
-        List<Future<?>> futures = new ArrayList<>();
-        for (int i = 0; i < threadCount; i++) {
+        runMultiThreaded(platformThreadPool, threadCount, blackhole, true);
+    }
+
+    @Benchmark
+    @Override
+    public void multiThreadedPut(Blackhole blackhole) throws Exception {
+        runMultiThreaded(platformThreadPool, threadCount, blackhole, false);
+    }
+
+    protected void runMultiThreaded(ExecutorService executor, int threads,
+                                    Blackhole blackhole, boolean isGet) throws Exception {
+        List<Future<?>> futures = new ArrayList<>(threads);
+
+        for (int i = 0; i < threads; i++) {
             futures.add(executor.submit(() -> {
                 try {
-                    s3Benchmark.executeGet("5MB", blackhole);
+                    if (isGet) {
+                        benchmark.executeGet("medium", blackhole);
+                    } else {
+                        benchmark.executePut("medium", blackhole);
+                    }
                 } catch (Exception e) {
-                    throw new RuntimeException(e);
+                    throw new RuntimeException("Operation failed", e);
                 }
             }));
         }
 
+        // Wait for all operations to complete
         for (Future<?> future : futures) {
             future.get();
         }
     }
 
-    @Benchmark
-    @Override
-    public void multiThreadedPut(Blackhole blackhole) throws Exception {
-        List<Future<?>> futures = new ArrayList<>();
-        for (int i = 0; i < threadCount; i++) {
-            futures.add(executor.submit(() -> s3Benchmark.executePut("5MB", blackhole)));
+    @TearDown(Level.Trial)
+    public void tearDown() {
+        logger.info("Tearing down Apache4 benchmark");
+
+        if (platformThreadPool != null) {
+            platformThreadPool.shutdown();
+            try {
+                if (!platformThreadPool.awaitTermination(30, TimeUnit.SECONDS)) {
+                    platformThreadPool.shutdownNow();
+                }
+            } catch (InterruptedException e) {
+                platformThreadPool.shutdownNow();
+            }
         }
 
-        for (Future<?> future : futures) {
-            future.get();
+        if (benchmark != null) {
+            benchmark.cleanup();
+        }
+
+        if (s3Client != null) {
+            s3Client.close();
         }
     }
 }

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

@@ -15,9 +15,7 @@
 
 package software.amazon.awssdk.benchmark.apache5;
 
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
+
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -43,7 +41,25 @@
 import software.amazon.awssdk.http.apache5.Apache5HttpClient;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.utils.Logger;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+/*
+ * 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.
+ */
 
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.SECONDS)
@@ -52,83 +68,86 @@
 @Warmup(iterations = 3, time = 15, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 5, time = 10, timeUnit = TimeUnit.SECONDS)
 public class Apache5Benchmark implements CoreBenchmark {
-    private static final Logger logger = Logger.loggerFor(Apache5Benchmark.class);
+    private static final Logger logger = Logger.getLogger(Apache5Benchmark.class.getName());
 
-    @Param("50")
+    @Param({"50"})
     private int maxConnections;
 
-    @Param("20")
+    @Param({"10"})
     private int threadCount;
 
+    @Param({"platform"})
+    private String executorType;
+
     private S3Client s3Client;
-    private S3BenchmarkImpl s3Benchmark;
-    private ExecutorService executor;
+    private S3BenchmarkImpl benchmark;
+    private ExecutorService executorService;
 
     @Setup(Level.Trial)
     public void setup() {
-        logger.info(() -> "Setting up Apache5 benchmark with " + threadCount + " threads");
+        logger.info("Setting up Apache5 benchmark with maxConnections=" + maxConnections);
 
+        // Apache 5 HTTP client
         SdkHttpClient httpClient = Apache5HttpClient.builder()
+                                                    .maxConnections(maxConnections)
                                                     .connectionTimeout(Duration.ofSeconds(10))
                                                     .socketTimeout(Duration.ofSeconds(30))
                                                     .connectionAcquisitionTimeout(Duration.ofSeconds(10))
-                                                    .maxConnections(maxConnections)
+                                                    .connectionMaxIdleTime(Duration.ofSeconds(60))
+                                                    .connectionTimeToLive(Duration.ofMinutes(5))
+                                                    .useIdleConnectionReaper(true)
                                                     .build();
 
+        // S3 client
         s3Client = S3Client.builder()
                            .region(Region.US_WEST_2)
                            .credentialsProvider(DefaultCredentialsProvider.create())
                            .httpClient(httpClient)
                            .build();
 
-        s3Benchmark = new S3BenchmarkImpl(s3Client);
-        s3Benchmark.setup();
+        // Initialize benchmark implementation
+        benchmark = new S3BenchmarkImpl(s3Client);
+        benchmark.setup();
 
-        executor = Executors.newFixedThreadPool(threadCount);
-    }
+        // Always use platform threads
+        executorService = Executors.newFixedThreadPool(threadCount, r -> {
+            Thread t = new Thread(r);
+            t.setName("apache5-platform-worker-" + t.getId());
+            return t;
+        });
+        logger.info("Using platform thread executor");
 
-    @TearDown(Level.Trial)
-    public void teardown() {
-        logger.info(() -> "Tearing down Apache5 benchmark");
-        s3Benchmark.cleanup();
-        s3Client.close();
-        executor.shutdown();
-        try {
-            if (!executor.awaitTermination(10, TimeUnit.SECONDS)) {
-                executor.shutdownNow();
-            }
-        } catch (InterruptedException e) {
-            executor.shutdownNow();
-            Thread.currentThread().interrupt();
-        }
+        logger.info("Apache5 benchmark setup complete");
     }
 
     @Benchmark
     @Override
     public void simpleGet(Blackhole blackhole) throws Exception {
-        s3Benchmark.executeGet("5MB", blackhole);
+        benchmark.executeGet("medium", blackhole);
     }
 
     @Benchmark
     @Override
-    public void simplePut(Blackhole blackhole) {
-        s3Benchmark.executePut("5MB", blackhole);
+    public void simplePut(Blackhole blackhole) throws Exception {
+        benchmark.executePut("medium", blackhole);
     }
 
     @Benchmark
     @Override
     public void multiThreadedGet(Blackhole blackhole) throws Exception {
-        List<Future<?>> futures = new ArrayList<>();
+        List<Future<?>> futures = new ArrayList<>(threadCount);
+
         for (int i = 0; i < threadCount; i++) {
-            futures.add(executor.submit(() -> {
+            futures.add(executorService.submit(() -> {
                 try {
-                    s3Benchmark.executeGet("5MB", blackhole);
+                    benchmark.executeGet("medium", blackhole);
                 } catch (Exception e) {
-                    throw new RuntimeException(e);
+                    throw new RuntimeException("GET operation failed", e);
                 }
             }));
         }
 
+        // Wait for all operations to complete
         for (Future<?> future : futures) {
             future.get();
         }
@@ -137,13 +156,45 @@ public void multiThreadedGet(Blackhole blackhole) throws Exception {
     @Benchmark
     @Override
     public void multiThreadedPut(Blackhole blackhole) throws Exception {
-        List<Future<?>> futures = new ArrayList<>();
+        List<Future<?>> futures = new ArrayList<>(threadCount);
+
         for (int i = 0; i < threadCount; i++) {
-            futures.add(executor.submit(() -> s3Benchmark.executePut("5MB", blackhole)));
+            futures.add(executorService.submit(() -> {
+                try {
+                    benchmark.executePut("medium", blackhole);
+                } catch (Exception e) {
+                    throw new RuntimeException("PUT operation failed", e);
+                }
+            }));
         }
 
+        // Wait for all operations to complete
         for (Future<?> future : futures) {
             future.get();
         }
     }
+
+    @TearDown(Level.Trial)
+    public void tearDown() {
+        logger.info("Tearing down Apache5 benchmark");
+
+        if (executorService != null) {
+            executorService.shutdown();
+            try {
+                if (!executorService.awaitTermination(30, TimeUnit.SECONDS)) {
+                    executorService.shutdownNow();
+                }
+            } catch (InterruptedException e) {
+                executorService.shutdownNow();
+            }
+        }
+
+        if (benchmark != null) {
+            benchmark.cleanup();
+        }
+
+        if (s3Client != null) {
+            s3Client.close();
+        }
+    }
 }