adding logging and dry

Author: kai-ion

src/aws-cpp-sdk-core/source/client/ClientConfiguration.cpp

@@ -552,7 +552,7 @@ std::shared_ptr<RetryStrategy> InitRetryStrategy(int maxAttempts, Aws::String re
     {
         retryMode = Aws::Config::GetCachedConfigValue("retry_mode");
     }
-    if (Aws::Environment::GetEnv("AWS_NEW_RETRIES_2026") == "true" && retryMode.empty())
+    if (Aws::Utils::StringUtils::ToLower(Aws::Environment::GetEnv("AWS_NEW_RETRIES_2026").c_str()) == "true" && retryMode.empty())
     {
         retryMode = "standard";
     }

src/aws-cpp-sdk-core/source/client/RetryStrategy.cpp

@@ -11,9 +11,12 @@
 #include <aws/core/utils/Outcome.h>
 #include <aws/core/utils/StringUtils.h>
 #include <aws/core/utils/local/Random.h>
+#include <aws/core/utils/logging/LogMacros.h>
 
 using namespace Aws::Utils::Threading;
 
+static const char RETRY_STRATEGY_TAG[] = "StandardRetryStrategy";
+
 namespace Aws
 {
     namespace Client
@@ -22,6 +25,11 @@ namespace Aws
         static const int RETRY_COST = 5;
         static const int TIMEOUT_RETRY_COST = 10;
 
+        static bool IsNewRetriesEnabled()
+        {
+            return Aws::Utils::StringUtils::ToLower(Aws::Environment::GetEnv("AWS_NEW_RETRIES_2026").c_str()) == "true";
+        }
+
         struct StandardRetryStrategy::RetryImpl
         {
             virtual ~RetryImpl() = default;
@@ -54,7 +62,12 @@ namespace Aws
                 auto it = headers.find("x-amz-retry-after");
                 if (it != headers.end())
                 {
-                    double headerSec = static_cast<double>(Aws::Utils::StringUtils::ConvertToInt64(it->second.c_str())) / 1000.0;
+                    long long headerMs = Aws::Utils::StringUtils::ConvertToInt64(it->second.c_str());
+                    if (headerMs < 0)
+                    {
+                        AWS_LOGSTREAM_DEBUG(RETRY_STRATEGY_TAG, "Ignoring invalid x-amz-retry-after value: " << it->second);
+                    }
+                    double headerSec = static_cast<double>(headerMs) / 1000.0;
                     double clamped = (std::max)(t_i, (std::min)(headerSec, 5.0 + t_i));
                     return static_cast<long>(clamped * 1000.0);
                 }
@@ -66,7 +79,7 @@ namespace Aws
 
         static Aws::UniquePtr<StandardRetryStrategy::RetryImpl> CreateRetryImpl()
         {
-            if (Aws::Environment::GetEnv("AWS_NEW_RETRIES_2026") == "true")
+            if (IsNewRetriesEnabled())
             {
                 return Aws::MakeUnique<NewRetriesImpl>("StandardRetryStrategy");
             }
@@ -75,7 +88,7 @@ namespace Aws
 
         static std::shared_ptr<RetryQuotaContainer> CreateQuotaContainer()
         {
-            if (Aws::Environment::GetEnv("AWS_NEW_RETRIES_2026") == "true")
+            if (IsNewRetriesEnabled())
             {
                 return Aws::MakeShared<ThrottleBasedRetryQuotaContainer>("StandardRetryStrategy");
             }