fix for custom UA

# Conflicts:
#	src/aws-cpp-sdk-core/include/aws/core/auth/AWSCredentials.h
#	src/aws-cpp-sdk-core/source/auth/signer/AWSAuthV4Signer.cpp

Author: kai-ion

src/aws-cpp-sdk-core/include/aws/core/auth/AWSCredentials.h

@@ -6,12 +6,67 @@
  #pragma once
 
 #include <aws/core/Core_EXPORTS.h>
+#include <aws/core/client/UserAgent.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/core/utils/DateTime.h>
 namespace Aws
 {
     namespace Auth
     {
+        /**
+         * Context class for credential resolution that tracks features used during credential retrieval.
+         */
+        class AWS_CORE_API CredentialsResolutionContext
+        {
+        public:
+          // Default constructor - no features tracked
+          CredentialsResolutionContext() = default;
+
+          /**
+           * Add a user agent feature to track credential usage.
+           */
+          void AddUserAgentFeature(Aws::Client::UserAgentFeature feature)
+          {
+            m_features.insert(feature);
+          }
+
+          /**
+           * Get all tracked credential features.
+           */
+          const Aws::Set<Aws::Client::UserAgentFeature> GetUserAgentFeatures() const
+          {
+            return m_features;
+          }
+
+          /**
+           * Set the user agent for this context
+           */
+          void SetUserAgent(const std::shared_ptr<Aws::Client::UserAgent>& userAgent)
+          {
+            m_userAgent = userAgent;
+          }
+
+          /**
+           * Get the user agent associated with this context
+           */
+          const std::shared_ptr<Aws::Client::UserAgent>& GetUserAgent() const
+          {
+            return m_userAgent;
+          }
+
+          /**
+           * Check if this context has a custom user agent
+           */
+          bool HasCustomUserAgent() const
+          {
+            return m_userAgent && m_userAgent->HasOverrideUserAgent();
+          }
+
+        private:
+          Aws::Set<Aws::Client::UserAgentFeature> m_features;
+          std::shared_ptr<Aws::Client::UserAgent> m_userAgent;
+        };
+
         /**
          * Simple data object around aws credentials
          */
@@ -214,12 +269,24 @@ namespace Aws
                 m_expiration = expiration;
             }
 
+            /**
+             * Gets credential resolution context. this is information about the call
+             * such as what credentials provider was used to to resolve the credentials
+             */
+            inline CredentialsResolutionContext GetContext() { return m_context; }
+
+            /**
+             * Adds a user agent feature used during credentials resolution to the credentials
+             * context. This is useful to track which credentials provider was used.
+             */
+            inline void AddUserAgentFeature(Aws::Client::UserAgentFeature feature) { m_context.AddUserAgentFeature(feature); }
         private:
             Aws::String m_accessKeyId;
             Aws::String m_secretKey;
             Aws::String m_sessionToken;
             Aws::Utils::DateTime m_expiration;
             Aws::String m_accountId;
+            CredentialsResolutionContext m_context;
         };
     }
 }

src/aws-cpp-sdk-core/include/aws/core/client/UserAgent.h

@@ -38,6 +38,8 @@ class AWS_CORE_API UserAgent {
  public:
   explicit UserAgent(const ClientConfiguration& clientConfiguration, const Aws::String& retryStrategyName, const Aws::String& apiName);
   Aws::String SerializeWithFeatures(const Aws::Set<UserAgentFeature>& features) const;
+  
+  bool HasOverrideUserAgent() const { return !m_overrideUserAgent.empty(); }
   void SetApiName(const Aws::String& apiName) { m_api = apiName; }
   void AddLegacyFeature(const Aws::String& legacyFeature);
 

src/aws-cpp-sdk-core/source/auth/signer/AWSAuthV4Signer.cpp

@@ -8,6 +8,7 @@
 #include <aws/core/auth/signer/AWSAuthSignerHelper.h>
 
 #include <aws/core/auth/AWSCredentialsProvider.h>
+#include <aws/core/client/UserAgent.h>
 #include <aws/core/http/HttpRequest.h>
 #include <aws/core/http/URI.h>
 #include <aws/core/utils/DateTime.h>
@@ -25,6 +26,7 @@
 
 #include <iomanip>
 #include <cstring>
+#include <numeric>
 
 using namespace Aws;
 using namespace Aws::Client;
@@ -81,6 +83,8 @@ bool AWSAuthV4Signer::SignRequestWithSigV4a(Aws::Http::HttpRequest& request, con
     bool signBody, long long expirationTimeInSeconds, Aws::Crt::Auth::SignatureType signatureType) const
 {
     AWSCredentials credentials = GetCredentials(request.GetServiceSpecificParameters());
+    
+    UpdateUserAgentWithCredentialFeatures(request, credentials.GetContext());
     auto crtCredentials = Aws::MakeShared<Aws::Crt::Auth::Credentials>(v4AsymmetricLogTag,
         Aws::Crt::ByteCursorFromCString(credentials.GetAWSAccessKeyId().c_str()),
         Aws::Crt::ByteCursorFromCString(credentials.GetAWSSecretKey().c_str()),
@@ -336,6 +340,9 @@ bool AWSAuthV4Signer::SignRequestWithCreds(Aws::Http::HttpRequest& request, cons
 bool AWSAuthV4Signer::SignRequest(Aws::Http::HttpRequest& request, const char* region, const char* serviceName, bool signBody) const
 {
     AWSCredentials credentials = GetCredentials(request.GetServiceSpecificParameters());
+    
+    UpdateUserAgentWithCredentialFeatures(request, credentials.GetContext());
+    
     return SignRequestWithCreds(request, credentials, region, serviceName, signBody);
 }
 
@@ -464,6 +471,9 @@ bool AWSAuthV4Signer::PresignRequest(Aws::Http::HttpRequest& request, const Aws:
 bool AWSAuthV4Signer::PresignRequest(Aws::Http::HttpRequest& request, const char* region, const char* serviceName, long long expirationTimeInSeconds) const
 {
     AWSCredentials credentials = GetCredentials(request.GetServiceSpecificParameters());
+    
+    UpdateUserAgentWithCredentialFeatures(request, credentials.GetContext());
+    
     return PresignRequest(request, credentials, region,serviceName, expirationTimeInSeconds );
 }
 
@@ -595,3 +605,56 @@ Aws::Auth::AWSCredentials AWSAuthV4Signer::GetCredentials(const std::shared_ptr<
     AWS_UNREFERENCED_PARAM(serviceSpecificParameters);
     return m_credentialsProvider->GetAWSCredentials();
 }
+
+void AWSAuthV4Signer::UpdateUserAgentWithCredentialFeatures(Aws::Http::HttpRequest& request, const Aws::Auth::CredentialsResolutionContext& context) const {
+    if (!request.HasHeader(USER_AGENT)) {
+        AWS_LOGSTREAM_DEBUG(v4LogTag, "Request does not have User-Agent header, skipping credential feature update");
+        return;
+    }
+
+    if (context.HasCustomUserAgent()) {
+        AWS_LOGSTREAM_DEBUG(v4LogTag, "Custom User-Agent detected, skipping credential feature update");
+        return;
+    }
+
+    const auto features = context.GetUserAgentFeatures();
+    if (features.empty()) {
+        AWS_LOGSTREAM_DEBUG(v4LogTag, "No credential features to add to User-Agent");
+        return;
+    }
+
+    std::vector<Aws::String> businessMetrics(features.size());
+    std::transform(features.begin(),
+      features.end(),
+      businessMetrics.begin(),
+      [](UserAgentFeature feature) -> Aws::String { return UserAgent::BusinessMetricForFeature(feature); });
+
+    const auto credentialFeatures = std::accumulate(std::next(businessMetrics.begin()),
+      businessMetrics.end(),
+      businessMetrics.front(),
+      [](const Aws::String& a, const Aws::String& b) {
+        return a + "," + b;
+      });
+
+    const auto userAgent = request.GetHeaderValue(USER_AGENT);
+    auto userAgentParsed = Aws::Utils::StringUtils::Split(userAgent, ' ');
+    auto metricsSegment = std::find_if(userAgentParsed.begin(), userAgentParsed.end(),
+        [](const Aws::String& value) { return value.find("m/") != Aws::String::npos; });
+
+    if (metricsSegment != userAgentParsed.end()) {
+        // Add new metrics to existing metrics section
+        *metricsSegment = Aws::String{*metricsSegment + "," + credentialFeatures};
+    } else {
+        // No metrics section exists, add new one
+        userAgentParsed.push_back("m/" + credentialFeatures);
+    }
+
+    // Reassemble all parts with spaces
+    const auto newUserAgent =  std::accumulate(std::next(userAgentParsed.begin()),
+      userAgentParsed.end(),
+      userAgentParsed.front(),
+      [](const Aws::String& a, const Aws::String& b) {
+        return a + " " + b;
+      });
+    request.SetUserAgent(newUserAgent);
+}