address code review feedback: refine CMakeLists.txt, replace std::set with std::array, optimize StringStream construction, add client null checks, and prevent possible ODR violations by moving config definitions to .cpp files.

Author: Alan4506

tests/performance-tests/CMakeLists.txt

@@ -17,18 +17,21 @@ FetchContent_Declare(
 )
 FetchContent_MakeAvailable(cxxopts)
 
-function(add_service_test SERVICE SDK_LIB PERF_TEST_FILE)
-    add_executable(${SERVICE}-performance-test
-            src/services/${SERVICE}/main.cpp
+function(add_service_test SERVICE)
+    string(TOLOWER ${SERVICE} SERVICE_LOWER)
+    add_executable(${SERVICE_LOWER}-performance-test
+            src/services/${SERVICE_LOWER}/main.cpp
             src/reporting/JsonReportingMetrics.cpp
-            src/services/${SERVICE}/${PERF_TEST_FILE}
+            src/services/${SERVICE_LOWER}/${SERVICE}PerformanceTest.cpp
+            src/services/${SERVICE_LOWER}/${SERVICE}TestConfig.cpp
     )
-    set_compiler_flags(${SERVICE}-performance-test)
-    set_compiler_warnings(${SERVICE}-performance-test)
-    target_include_directories(${SERVICE}-performance-test PRIVATE include)
-    target_link_libraries(${SERVICE}-performance-test PRIVATE aws-cpp-sdk-core ${SDK_LIB} cxxopts::cxxopts)
-    target_compile_options(${SERVICE}-performance-test PRIVATE -std=c++17 -fexceptions)
+    set_compiler_flags(${SERVICE_LOWER}-performance-test)
+    set_compiler_warnings(${SERVICE_LOWER}-performance-test)
+    target_include_directories(${SERVICE_LOWER}-performance-test PRIVATE include)
+    target_link_libraries(${SERVICE_LOWER}-performance-test PRIVATE aws-cpp-sdk-core aws-cpp-sdk-${SERVICE_LOWER} cxxopts::cxxopts)
+    set_property(TARGET ${SERVICE_LOWER}-performance-test PROPERTY CXX_STANDARD 20)
+    set_property(TARGET ${SERVICE_LOWER}-performance-test PROPERTY COMPILE_OPTIONS "-fexceptions")
 endfunction()
 
-add_service_test(s3 aws-cpp-sdk-s3 S3PerformanceTest.cpp)
-add_service_test(dynamodb aws-cpp-sdk-dynamodb DynamoDBPerformanceTest.cpp)
+add_service_test(S3)
+add_service_test(DynamoDB)

tests/performance-tests/include/performance-tests/services/s3/S3PerformanceTest.h

@@ -30,7 +30,7 @@ struct TestCase {
  */
 class S3PerformanceTest : public PerformanceTestBase {
  public:
-  S3PerformanceTest(const Aws::String& region, const TestCase& config, const Aws::String& availabilityZoneId, int iterations = 3);
+  S3PerformanceTest(const Aws::String& region, const TestCase& config, const Aws::String& availabilityZoneId, int iterations = 10);
 
   void Setup() override;
   void TearDown() override;

tests/performance-tests/include/performance-tests/services/s3/S3TestConfig.h

@@ -8,22 +8,14 @@
 #include <performance-tests/services/s3/S3PerformanceTest.h>
 
 #include <array>
-#include <set>
 
 namespace PerformanceTest {
 namespace Services {
 namespace S3 {
 namespace TestConfig {
-const std::set<const char*> TestOperations = {"PutObject", "GetObject"};
-
-const std::array<TestCase, 6> TestMatrix = {{{"8KB", 8 * 1024, "s3-standard"},
-                                             {"64KB", 64 * 1024, "s3-standard"},
-                                             {"1MB", 1024 * 1024, "s3-standard"},
-                                             {"8KB", 8 * 1024, "s3-express"},
-                                             {"64KB", 64 * 1024, "s3-express"},
-                                             {"1MB", 1024 * 1024, "s3-express"}}};
-
-const char* OutputFilename = "s3-performance-test-results.json";
+extern const std::array<const char*, 2> TestOperations;
+extern const std::array<TestCase, 6> TestMatrix;
+extern const char* OutputFilename;
 }  // namespace TestConfig
 }  // namespace S3
 }  // namespace Services

tests/performance-tests/src/services/s3/S3PerformanceTest.cpp

@@ -63,6 +63,11 @@ void PerformanceTest::Services::S3::S3PerformanceTest::Setup() {
 }
 
 void PerformanceTest::Services::S3::S3PerformanceTest::Run() {
+  if (!m_s3) {
+    AWS_LOG_ERROR("PerformanceTest", "S3:Run - S3 client not initialized, Setup() failed or was not called");
+    return;
+  }
+
   if (m_bucketName.empty()) {
     AWS_LOG_ERROR("PerformanceTest", "S3:Run - Bucket setup failed, skipping test");
     return;
@@ -72,8 +77,7 @@ void PerformanceTest::Services::S3::S3PerformanceTest::Run() {
 
   // Run PutObject multiple times
   for (int i = 0; i < m_iterations; i++) {
-    auto stream = Aws::MakeShared<Aws::StringStream>("PerfStream");
-    *stream << randomPayload;
+    const auto stream = Aws::MakeShared<Aws::StringStream>("PerfStream", randomPayload);
 
     Aws::S3::Model::PutObjectRequest por;
     por.WithBucket(m_bucketName).WithKey("test-object-" + Aws::Utils::StringUtils::to_string(i)).SetBody(stream);
@@ -99,6 +103,11 @@ void PerformanceTest::Services::S3::S3PerformanceTest::Run() {
 }
 
 void PerformanceTest::Services::S3::S3PerformanceTest::TearDown() {
+  if (!m_s3) {
+    AWS_LOG_ERROR("PerformanceTest", "S3:TearDown - S3 client not initialized, Setup() failed or was not called");
+    return;
+  }
+
   if (m_bucketName.empty()) {
     AWS_LOG_ERROR("PerformanceTest", "S3:TearDown - No bucket to clean up, setup likely failed");
     return;

tests/performance-tests/src/services/s3/S3TestConfig.cpp

@@ -0,0 +1,30 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <performance-tests/services/s3/S3PerformanceTest.h>
+#include <performance-tests/services/s3/S3TestConfig.h>
+
+#include <array>
+
+namespace PerformanceTest {
+namespace Services {
+namespace S3 {
+namespace TestConfig {
+
+const std::array<const char*, 2> TestOperations = {"PutObject", "GetObject"};
+
+const std::array<TestCase, 6> TestMatrix = {{{.sizeLabel = "8KB", .sizeBytes = 8 * 1024, .bucketTypeLabel = "s3-standard"},
+                                             {.sizeLabel = "64KB", .sizeBytes = 64 * 1024, .bucketTypeLabel = "s3-standard"},
+                                             {.sizeLabel = "1MB", .sizeBytes = 1024 * 1024, .bucketTypeLabel = "s3-standard"},
+                                             {.sizeLabel = "8KB", .sizeBytes = 8 * 1024, .bucketTypeLabel = "s3-express"},
+                                             {.sizeLabel = "64KB", .sizeBytes = 64 * 1024, .bucketTypeLabel = "s3-express"},
+                                             {.sizeLabel = "1MB", .sizeBytes = 1024 * 1024, .bucketTypeLabel = "s3-express"}}};
+
+const char* OutputFilename = "s3-performance-test-results.json";
+
+}  // namespace TestConfig
+}  // namespace S3
+}  // namespace Services
+}  // namespace PerformanceTest