Revert "Add Business Metrics for Credential Providers (#6443)" (#6456)

This reverts commit 19720d9.

Author: S-Saranya1

.changes/next-release/feature-AWSSDKforJavav2-c2d8ec6.json

@@ -40,45 +40,5 @@ public interface ChildProfileCredentialsProviderFactory {
      * provider.
      * @return The credentials provider with permissions derived from the source credentials provider and profile.
      */
-    default AwsCredentialsProvider create(AwsCredentialsProvider sourceCredentialsProvider, Profile profile) {
-        ChildProfileCredentialsRequest request = new ChildProfileCredentialsRequest(sourceCredentialsProvider, profile, null);
-        return create(request);
-    }
-
-    /**
-     * Create a credentials provider for the provided profile, using the provided source credentials provider to authenticate
-     * with AWS. In the case of STS, the returned credentials provider is for a role that has been assumed, and the provided
-     * source credentials provider is the credentials that should be used to authenticate that the user is allowed to assume
-     * that role.
-     *
-     * @param request The request containing all parameters needed to create the child credentials provider.
-     * @return The credentials provider with permissions derived from the request parameters.
-     */
-    AwsCredentialsProvider create(ChildProfileCredentialsRequest request);
-
-    final class ChildProfileCredentialsRequest {
-        private final AwsCredentialsProvider sourceCredentialsProvider;
-        private final Profile profile;
-        private final String sourceFeatureId;
-
-        public ChildProfileCredentialsRequest(AwsCredentialsProvider sourceCredentialsProvider, 
-                                            Profile profile, 
-                                            String sourceFeatureId) {
-            this.sourceCredentialsProvider = sourceCredentialsProvider;
-            this.profile = profile;
-            this.sourceFeatureId = sourceFeatureId;
-        }
-
-        public AwsCredentialsProvider sourceCredentialsProvider() {
-            return sourceCredentialsProvider;
-        }
-
-        public Profile profile() {
-            return profile;
-        }
-
-        public String sourceFeatureId() {
-            return sourceFeatureId;
-        }
-    }
+    AwsCredentialsProvider create(AwsCredentialsProvider sourceCredentialsProvider, Profile profile);
 }

core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ChildProfileCredentialsProviderFactory.java

@@ -39,7 +39,6 @@
 import software.amazon.awssdk.auth.credentials.internal.HttpCredentialsLoader.LoadedCredentials;
 import software.amazon.awssdk.core.SdkSystemSetting;
 import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
 import software.amazon.awssdk.core.util.SdkUserAgent;
 import software.amazon.awssdk.regions.util.ResourcesEndpointProvider;
 import software.amazon.awssdk.regions.util.ResourcesEndpointRetryPolicy;
@@ -73,8 +72,7 @@
 public final class ContainerCredentialsProvider
     implements HttpCredentialsProvider,
                ToCopyableBuilder<ContainerCredentialsProvider.Builder, ContainerCredentialsProvider> {
-    private static final String CLASS_NAME = "ContainerCredentialsProvider";
-    private static final String PROVIDER_NAME = BusinessMetricFeatureId.CREDENTIALS_HTTP.value();
+    private static final String PROVIDER_NAME = "ContainerCredentialsProvider";
     private static final Predicate<InetAddress> IS_LOOPBACK_ADDRESS = InetAddress::isLoopbackAddress;
     private static final Predicate<InetAddress> ALLOWED_HOSTS_RULES = IS_LOOPBACK_ADDRESS;
     private static final String HTTPS = "https";
@@ -92,8 +90,6 @@ public final class ContainerCredentialsProvider
     private final Boolean asyncCredentialUpdateEnabled;
 
     private final String asyncThreadName;
-    private final String sourceFeatureId;
-    private final String providerName;
 
     /**
      * @see #builder()
@@ -102,11 +98,7 @@ private ContainerCredentialsProvider(BuilderImpl builder) {
         this.endpoint = builder.endpoint;
         this.asyncCredentialUpdateEnabled = builder.asyncCredentialUpdateEnabled;
         this.asyncThreadName = builder.asyncThreadName;
-        this.sourceFeatureId = builder.sourceFeatureId;
-        this.providerName = StringUtils.isEmpty(builder.sourceFeatureId)
-            ? PROVIDER_NAME 
-            : builder.sourceFeatureId + "," + PROVIDER_NAME;
-        this.httpCredentialsLoader = HttpCredentialsLoader.create(providerName());
+        this.httpCredentialsLoader = HttpCredentialsLoader.create(PROVIDER_NAME);
 
         if (Boolean.TRUE.equals(builder.asyncCredentialUpdateEnabled)) {
             Validate.paramNotBlank(builder.asyncThreadName, "asyncThreadName");
@@ -134,7 +126,7 @@ public static Builder builder() {
 
     @Override
     public String toString() {
-        return ToString.create(CLASS_NAME);
+        return ToString.create(PROVIDER_NAME);
     }
 
     private RefreshResult<AwsCredentials> refreshCredentials() {
@@ -168,10 +160,6 @@ private Instant prefetchTime(Instant expiration) {
         return ComparableUtils.minimum(oneHourFromNow, fifteenMinutesBeforeExpiration);
     }
 
-    private String providerName() {
-        return this.providerName;
-    }
-
     @Override
     public AwsCredentials resolveCredentials() {
         return credentialsCache.get();
@@ -330,7 +318,6 @@ private static final class BuilderImpl implements Builder {
         private String endpoint;
         private Boolean asyncCredentialUpdateEnabled;
         private String asyncThreadName;
-        private String sourceFeatureId;
 
         private BuilderImpl() {
             asyncThreadName("container-credentials-provider");
@@ -340,7 +327,6 @@ private BuilderImpl(ContainerCredentialsProvider credentialsProvider) {
             this.endpoint = credentialsProvider.endpoint;
             this.asyncCredentialUpdateEnabled = credentialsProvider.asyncCredentialUpdateEnabled;
             this.asyncThreadName = credentialsProvider.asyncThreadName;
-            this.sourceFeatureId = credentialsProvider.sourceFeatureId;
         }
 
         @Override
@@ -373,16 +359,6 @@ public void setAsyncThreadName(String asyncThreadName) {
             asyncThreadName(asyncThreadName);
         }
 
-        @Override
-        public Builder sourceFeatureId(String sourceFeatureId) {
-            this.sourceFeatureId = sourceFeatureId;
-            return this;
-        }
-
-        public void setSourceFeatureId(String sourceFeatureId) {
-            sourceFeatureId(sourceFeatureId);
-        }
-
         @Override
         public ContainerCredentialsProvider build() {
             return new ContainerCredentialsProvider(this);

core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProvider.java

@@ -18,7 +18,6 @@
 import java.util.Optional;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.auth.credentials.internal.SystemSettingsCredentialsProvider;
-import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
 import software.amazon.awssdk.utils.SystemSetting;
 import software.amazon.awssdk.utils.ToString;
 
@@ -29,8 +28,7 @@
 @SdkPublicApi
 public final class EnvironmentVariableCredentialsProvider extends SystemSettingsCredentialsProvider {
 
-    private static final String CLASS_NAME = "EnvironmentVariableCredentialsProvider";
-    private static final String PROVIDER_NAME = BusinessMetricFeatureId.CREDENTIALS_ENV_VARS.value();
+    private static final String PROVIDER_NAME = "EnvironmentVariableCredentialsProvider";
 
     private EnvironmentVariableCredentialsProvider() {
     }
@@ -54,6 +52,6 @@ protected String provider() {
 
     @Override
     public String toString() {
-        return ToString.create(CLASS_NAME);
+        return ToString.create(PROVIDER_NAME);
     }
 }

core/auth/src/main/java/software/amazon/awssdk/auth/credentials/EnvironmentVariableCredentialsProvider.java

@@ -16,7 +16,6 @@
 package software.amazon.awssdk.auth.credentials;
 
 import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
 import software.amazon.awssdk.utils.SdkAutoCloseable;
 
 /**
@@ -49,16 +48,6 @@ interface Builder<TypeToBuildT extends HttpCredentialsProvider, BuilderT extends
          */
         BuilderT endpoint(String endpoint);
 
-        /**
-         * An optional string list of {@link BusinessMetricFeatureId} denoting previous credentials providers
-         * that are chained with this one.
-         * <p><b>Note:</b> This method is primarily intended for use by AWS SDK internal components
-         * and should not be used directly by external users.</p>
-         */
-        default BuilderT sourceFeatureId(String sourceFeatureId) {
-            throw new UnsupportedOperationException();
-        }
-
         /**
          * Build the credentials provider based on the configuration on this builder.
          */

core/auth/src/main/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProvider.java

@@ -37,15 +37,13 @@
 import software.amazon.awssdk.core.SdkSystemSetting;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.core.exception.SdkServiceException;
-import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
 import software.amazon.awssdk.profiles.ProfileFile;
 import software.amazon.awssdk.profiles.ProfileFileSupplier;
 import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
 import software.amazon.awssdk.profiles.ProfileProperty;
 import software.amazon.awssdk.regions.util.HttpResourcesUtils;
 import software.amazon.awssdk.regions.util.ResourcesEndpointProvider;
 import software.amazon.awssdk.utils.Logger;
-import software.amazon.awssdk.utils.StringUtils;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.Validate;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
@@ -69,8 +67,7 @@ public final class InstanceProfileCredentialsProvider
     implements HttpCredentialsProvider,
                ToCopyableBuilder<InstanceProfileCredentialsProvider.Builder, InstanceProfileCredentialsProvider> {
     private static final Logger log = Logger.loggerFor(InstanceProfileCredentialsProvider.class);
-    private static final String CLASS_NAME = "InstanceProfileCredentialsProvider";
-    private static final String PROVIDER_NAME = BusinessMetricFeatureId.CREDENTIALS_IMDS.value();
+    private static final String PROVIDER_NAME = "InstanceProfileCredentialsProvider";
     private static final String EC2_METADATA_TOKEN_HEADER = "x-aws-ec2-metadata-token";
     private static final String SECURITY_CREDENTIALS_RESOURCE = "/latest/meta-data/iam/security-credentials/";
     private static final String TOKEN_RESOURCE = "/latest/api/token";
@@ -93,9 +90,6 @@ public final class InstanceProfileCredentialsProvider
 
     private final Duration staleTime;
 
-    private final String sourceFeatureId;
-    private final String providerName;
-
     /**
      * @see #builder()
      */
@@ -108,12 +102,8 @@ private InstanceProfileCredentialsProvider(BuilderImpl builder) {
                                    .orElseGet(() -> ProfileFileSupplier.fixedProfileFile(ProfileFile.defaultProfileFile()));
         this.profileName = Optional.ofNullable(builder.profileName)
                                    .orElseGet(ProfileFileSystemSetting.AWS_PROFILE::getStringValueOrThrow);
-        this.sourceFeatureId = builder.sourceFeatureId;
-        this.providerName = StringUtils.isEmpty(builder.sourceFeatureId)
-            ? PROVIDER_NAME 
-            : builder.sourceFeatureId + "," + PROVIDER_NAME;
 
-        this.httpCredentialsLoader = HttpCredentialsLoader.create(providerName());
+        this.httpCredentialsLoader = HttpCredentialsLoader.create(PROVIDER_NAME);
         this.configProvider =
             Ec2MetadataConfigProvider.builder()
                                      .profileFile(profileFile)
@@ -212,13 +202,9 @@ public void close() {
         credentialsCache.close();
     }
 
-    private String providerName() {
-        return this.providerName;
-    }
-
     @Override
     public String toString() {
-        return ToString.create(CLASS_NAME);
+        return ToString.create(PROVIDER_NAME);
     }
 
     private ResourcesEndpointProvider createEndpointProvider() {
@@ -386,7 +372,6 @@ static final class BuilderImpl implements Builder {
         private Supplier<ProfileFile> profileFile;
         private String profileName;
         private Duration staleTime;
-        private String sourceFeatureId;
 
         private BuilderImpl() {
             asyncThreadName("instance-profile-credentials-provider");
@@ -400,7 +385,6 @@ private BuilderImpl(InstanceProfileCredentialsProvider provider) {
             this.profileFile = provider.profileFile;
             this.profileName = provider.profileName;
             this.staleTime = provider.staleTime;
-            this.sourceFeatureId = provider.sourceFeatureId;
         }
 
         Builder clock(Clock clock) {
@@ -479,16 +463,6 @@ public void setStaleTime(Duration duration) {
             staleTime(duration);
         }
 
-        @Override
-        public Builder sourceFeatureId(String sourceFeatureId) {
-            this.sourceFeatureId = sourceFeatureId;
-            return this;
-        }
-
-        public void setSourceFeatureId(String sourceFeatureId) {
-            sourceFeatureId(sourceFeatureId);
-        }
-
         @Override
         public InstanceProfileCredentialsProvider build() {
             return new InstanceProfileCredentialsProvider(this);