Create another function to manipulate the header in the signer

then don’t need to change awsclient

Author: kai-ion

src/aws-cpp-sdk-core/include/aws/core/auth/signer/AWSAuthV4Signer.h

@@ -202,6 +202,7 @@ namespace Aws
 
         protected:
             virtual bool ServiceRequireUnsignedPayload(const Aws::String& serviceName) const;
+            void UpdateUserAgentWithCredentialFeatures(Aws::Http::HttpRequest& request, const Aws::AmazonWebServiceRequest& awsRequest) const;
             bool m_includeSha256HashHeader;
 
         private:

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

@@ -7,7 +7,9 @@
 #include <aws/core/auth/signer/AWSAuthSignerCommon.h>
 #include <aws/core/auth/signer/AWSAuthSignerHelper.h>
 
+#include <aws/core/AmazonWebServiceRequest.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>
@@ -342,6 +344,10 @@ bool AWSAuthV4Signer::SignRequest(Aws::Http::HttpRequest& request, const char* r
 bool AWSAuthV4Signer::SignRequest(Aws::Http::HttpRequest& request, Aws::AmazonWebServiceRequest& awsRequest, const char* region, const char* serviceName, bool signBody) const
 {
     AWSCredentials credentials = GetCredentials(awsRequest, request.GetServiceSpecificParameters());
+    
+    // Update User-Agent with credential tracking features added during credential resolution
+    UpdateUserAgentWithCredentialFeatures(request, awsRequest);
+    
     return SignRequestWithCreds(request, credentials, region, serviceName, signBody);
 }
 
@@ -606,3 +612,48 @@ Aws::Auth::AWSCredentials AWSAuthV4Signer::GetCredentials(Aws::AmazonWebServiceR
     AWS_UNREFERENCED_PARAM(serviceSpecificParameters);
     return m_credentialsProvider->GetAWSCredentials(awsRequest);
 }
+
+void AWSAuthV4Signer::UpdateUserAgentWithCredentialFeatures(Aws::Http::HttpRequest& request, const Aws::AmazonWebServiceRequest& awsRequest) const {
+    if (request.HasHeader(USER_AGENT)) {
+        auto existingUA = request.GetHeaderValue(USER_AGENT);
+        auto features = awsRequest.GetUserAgentFeatures();
+        
+        if (!features.empty()) {
+            // Build business metrics string from features
+            Aws::String businessMetrics = "m/";
+            bool first = true;
+            for (const auto& feature : features) {
+                if (!first) businessMetrics += ",";
+                first = false;
+                
+                // Map features to their character codes
+                switch (feature) {
+                    case Aws::Client::UserAgentFeature::CREDENTIALS_ENV_VARS:
+                        businessMetrics += "g";
+                        break;
+                    // Add other feature mappings as needed
+                    default:
+                        // Skip unknown features
+                        break;
+                }
+            }
+            
+            // Parse existing User-Agent and replace business metrics section
+            auto parts = Aws::Utils::StringUtils::Split(existingUA, ' ');
+            for (auto& part : parts) {
+                if (part.find("m/") == 0) {
+                    part = businessMetrics;
+                    break;
+                }
+            }
+            
+            // Rejoin and update
+            Aws::String updatedUA;
+            for (size_t i = 0; i < parts.size(); ++i) {
+                if (i > 0) updatedUA += " ";
+                updatedUA += parts[i];
+            }
+            request.SetUserAgent(updatedUA);
+        }
+    }
+}

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

@@ -44,7 +44,6 @@
 #include <aws/core/Version.h>
 #include <aws/core/platform/Environment.h>
 #include <aws/core/platform/OSVersionInfo.h>
-#include <aws/core/auth/AWSCredentialsProviderChain.h>
 
 #include <smithy/tracing/TracingUtils.h>
 #include <smithy/client/features/ChecksumInterceptor.h>
@@ -592,11 +591,6 @@ HttpResponseOutcome AWSClient::AttemptOneRequest(const std::shared_ptr<Aws::Http
         return HttpResponseOutcome(AWSError<CoreErrors>(CoreErrors::CLIENT_SIGNING_FAILURE, "", "SDK failed to sign the request", false/*retryable*/));
     }
 
-    // Update User-Agent with credential tracking features added during signing
-    if (m_userAgentInterceptor) {
-        m_userAgentInterceptor->UpdateUserAgentWithRequestFeatures(request, httpRequest);
-    }
-
     if (request.GetRequestSignedHandler())
     {
         request.GetRequestSignedHandler()(*httpRequest);