Update User-Agent with credential tracking features added during signing

Author: kai-ion

src/aws-cpp-sdk-core/include/smithy/client/features/UserAgentInterceptor.h

@@ -7,6 +7,8 @@
 #include <aws/core/client/ClientConfiguration.h>
 #include <aws/core/client/RetryStrategy.h>
 #include <aws/core/client/UserAgent.h>
+#include <aws/core/AmazonWebServiceRequest.h>
+#include <aws/core/http/HttpRequest.h>
 #include <smithy/interceptor/Interceptor.h>
 
 #include <utility>
@@ -39,6 +41,10 @@ class UserAgentInterceptor : public interceptor::Interceptor {
 
   void AddLegacyFeaturesToUserAgent(const Aws::String& valueToAppend) { m_userAgent.AddLegacyFeature(valueToAppend); }
 
+  void UpdateUserAgentWithRequestFeatures(const Aws::AmazonWebServiceRequest& request, const std::shared_ptr<Aws::Http::HttpRequest>& httpRequest) {
+    httpRequest->SetUserAgent(m_userAgent.SerializeWithFeatures(request.GetUserAgentFeatures()));
+  }
+
  private:
   Aws::Client::UserAgent m_userAgent;
 };

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

@@ -596,6 +596,11 @@ 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);