removed imds and profile tracking temporarily

removed default constructor for context object
Updated Authv4signer logic for double /m

Author: kai-ion

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

@@ -39,9 +39,6 @@ namespace Aws
             // Default constructor - no features tracked
             CredentialsResolutionContext() = default;
 
-            explicit CredentialsResolutionContext(Aws::Set<Aws::Client::UserAgentFeature> features)
-                : m_features(std::move(features)) {}
-            
             /**
              * Add a user agent feature to track credential usage.
              */
@@ -218,11 +215,6 @@ namespace Aws
             * Retrieves the credentials if found, otherwise returns empty credential set.
             */
             AWSCredentials GetAWSCredentials() override;
-            
-            /**
-            * Context-based interface that adds profile credential tracking.
-            */
-            AWSCredentials GetAWSCredentials(CredentialsResolutionContext& context) override;
 
             /**
              * Returns the fullpath of the calculated credentials profile file
@@ -276,11 +268,6 @@ namespace Aws
             * Retrieves the credentials if found, otherwise returns empty credential set.
             */
             AWSCredentials GetAWSCredentials() override;
-            
-            /**
-            * Context-based interface that adds instance profile credential tracking.
-            */
-            AWSCredentials GetAWSCredentials(CredentialsResolutionContext& context) override;
 
         protected:
             void Reload() override;

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

@@ -33,8 +33,6 @@ enum class UserAgentFeature {
   RESOLVED_ACCOUNT_ID,
   GZIP_REQUEST_COMPRESSION,
   CREDENTIALS_ENV_VARS,
-  CREDENTIALS_IMDS,
-  CREDENTIALS_PROFILE,
 };
 
 class AWS_CORE_API UserAgent {

src/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp

@@ -212,14 +212,6 @@ AWSCredentials ProfileConfigFileAWSCredentialsProvider::GetAWSCredentials()
     return AWSCredentials();
 }
 
-AWSCredentials ProfileConfigFileAWSCredentialsProvider::GetAWSCredentials(CredentialsResolutionContext& context)
-{
-    AWSCredentials credentials = GetAWSCredentials();
-    if (!credentials.IsEmpty()) {
-        context.AddUserAgentFeature(Aws::Client::UserAgentFeature::CREDENTIALS_PROFILE);
-    }
-    return credentials;
-}
 
 void ProfileConfigFileAWSCredentialsProvider::Reload()
 {
@@ -289,15 +281,6 @@ AWSCredentials InstanceProfileCredentialsProvider::GetAWSCredentials()
     return AWSCredentials();
 }
 
-AWSCredentials InstanceProfileCredentialsProvider::GetAWSCredentials(CredentialsResolutionContext& context)
-{
-    AWSCredentials credentials = GetAWSCredentials();
-    if (!credentials.IsEmpty()) {
-        context.AddUserAgentFeature(Aws::Client::UserAgentFeature::CREDENTIALS_IMDS);
-    }
-    return credentials;
-}
-
 bool InstanceProfileCredentialsProvider::ExpiresSoon() const
 {
     auto profileIter = m_ec2MetadataConfigLoader->GetProfiles().find(Aws::Config::INSTANCE_PROFILE_KEY);

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

@@ -338,8 +338,7 @@ bool AWSAuthV4Signer::SignRequest(Aws::Http::HttpRequest& request, const char* r
 {
     Aws::Auth::CredentialsResolutionContext context;
     AWSCredentials credentials = GetCredentials(context, request.GetServiceSpecificParameters());
-
-    // Update User-Agent with credential tracking features from context
+  
     UpdateUserAgentWithCredentialFeatures(request, context);
 
     return SignRequestWithCreds(request, credentials, region, serviceName, signBody);
@@ -616,25 +615,35 @@ void AWSAuthV4Signer::UpdateUserAgentWithCredentialFeatures(Aws::Http::HttpReque
     if (features.empty()) {
         return;
     }
-
-    // Build credential features string
+  
     Aws::StringStream credentialFeatures;
     for (const auto& feature : features) {
         switch (feature) {
             case Aws::Client::UserAgentFeature::CREDENTIALS_ENV_VARS:
                 credentialFeatures << "g";
                 break;
             default:
-                // Skip non-credential features
                 break;
         }
     }
-
-    // Only append if we have credential features
+  
     if (!credentialFeatures.str().empty()) {
         Aws::String existingUA = request.GetHeaderValue(USER_AGENT);
-        Aws::StringStream updatedUA;
-        updatedUA << existingUA << " m/" << credentialFeatures.str();
-        request.SetUserAgent(updatedUA.str());
+        size_t mPos = existingUA.find(" m/");
+        
+        if (mPos != Aws::String::npos) {
+            // "m/" section already exists, find where to insert our metrics
+            size_t metricsStart = mPos + 3; // Position after "m/"
+            size_t nextSectionPos = existingUA.find(" ", metricsStart);
+            
+            // Insert our metrics with comma separator at the end of existing metrics
+            Aws::String newUA = existingUA;
+            newUA.insert(nextSectionPos != Aws::String::npos ? nextSectionPos : existingUA.length(), 
+                        "," + credentialFeatures.str());
+            request.SetUserAgent(newUA);
+        } else {
+            // No existing "m/" section, add it
+            request.SetUserAgent(existingUA + " m/" + credentialFeatures.str());
+        }
     }
 }

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

@@ -43,8 +43,6 @@ const std::pair<UserAgentFeature, const char*> BUSINESS_METRIC_MAPPING[] = {
     {UserAgentFeature::RESOLVED_ACCOUNT_ID, "T"},
     {UserAgentFeature::GZIP_REQUEST_COMPRESSION, "L"},
     {UserAgentFeature::CREDENTIALS_ENV_VARS, "g"},
-    {UserAgentFeature::CREDENTIALS_IMDS, "0"},
-    {UserAgentFeature::CREDENTIALS_PROFILE, "n"},
 };
 
 Aws::String BusinessMetricForFeature(UserAgentFeature feature) {

tests/aws-cpp-sdk-core-tests/aws/auth/CredentialTrackingTest.cpp

@@ -112,6 +112,15 @@ TEST_F(CredentialTrackingTest, TestEnvironmentCredentialsTracking)
 
     const auto userAgentParsed = Aws::Utils::StringUtils::Split(userAgent, ' ');
 
+    // Verify there's only one m/ section (no duplicate m/ sections)
+    int mSectionCount = 0;
+    for (const auto& part : userAgentParsed) {
+        if (part.find("m/") != Aws::String::npos) {
+            mSectionCount++;
+        }
+    }
+    EXPECT_EQ(1, mSectionCount);
+
     // Check for environment credentials business metric (g) in user agent
     auto businessMetrics = std::find_if(userAgentParsed.begin(), userAgentParsed.end(),
         [](const Aws::String& value) { return value.find("m/") != Aws::String::npos && value.find("g") != Aws::String::npos; });