Address PR feedback

Author: S-Saranya1

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

@@ -2,5 +2,5 @@
     "type": "feature",
     "category": "AWS SDK for Java v2",
     "contributor": "",
-    "description": "Adds business metrics tracking for credential providers and S3_Express_Bucket."
+    "description": "Adds business metrics tracking for credential providers."
 }

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

@@ -36,18 +36,14 @@ private StaticCredentialsProvider(AwsCredentials credentials) {
     private AwsCredentials withProviderName(AwsCredentials credentials) {
         if (credentials instanceof AwsBasicCredentials) {
             AwsBasicCredentials basicCreds = (AwsBasicCredentials) credentials;
-            if (basicCreds.providerName()
-                          .map(BusinessMetricFeatureId.CREDENTIALS_PROFILE.value()::equals)
-                          .orElse(false)) {
+            if (basicCreds.providerName().isPresent()) {
                 return basicCreds;
             }
             return basicCreds.copy(c -> c.providerName(PROVIDER_NAME));
         }
         if (credentials instanceof AwsSessionCredentials) {
             AwsSessionCredentials sessionCreds = (AwsSessionCredentials) credentials;
-            if (sessionCreds.providerName()
-                            .map(BusinessMetricFeatureId.CREDENTIALS_PROFILE.value()::equals)
-                            .orElse(false)) {
+            if (sessionCreds.providerName().isPresent()) {
                 return sessionCreds;
             }
             return sessionCreds.copy(c -> c.providerName(PROVIDER_NAME));

core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtils.java

@@ -117,15 +117,15 @@ private Optional<AwsCredentialsProvider> credentialsProvider(Set<String> childre
      */
     private Optional<CredentialsWithFeatureId> credentialsProviderWithFeatureID(Set<String> children) {
         if (properties.containsKey(ProfileProperty.ROLE_ARN) && properties.containsKey(ProfileProperty.WEB_IDENTITY_TOKEN_FILE)) {
-            return Optional.ofNullable(roleAndWebIdentityTokenProfileCredentialsProvider());
+            return Optional.of(roleAndWebIdentityTokenProfileCredentialsProvider());
         }
 
         if (properties.containsKey(ProfileProperty.SSO_ROLE_NAME)
             || properties.containsKey(ProfileProperty.SSO_ACCOUNT_ID)
             || properties.containsKey(ProfileProperty.SSO_REGION)
             || properties.containsKey(ProfileProperty.SSO_START_URL)
             || properties.containsKey(ProfileSection.SSO_SESSION.getPropertyKeyName())) {
-            return Optional.ofNullable(ssoProfileCredentialsProvider());
+            return Optional.of(ssoProfileCredentialsProvider());
         }
 
         if (properties.containsKey(ProfileProperty.ROLE_ARN)) {
@@ -136,16 +136,16 @@ private Optional<CredentialsWithFeatureId> credentialsProviderWithFeatureID(Set<
                                 ProfileProperty.SOURCE_PROFILE, ProfileProperty.CREDENTIAL_SOURCE);
 
             if (hasSourceProfile) {
-                return Optional.ofNullable(roleAndSourceProfileBasedProfileCredentialsProvider(children));
+                return Optional.of(roleAndSourceProfileBasedProfileCredentialsProvider(children));
             }
 
             if (hasCredentialSource) {
-                return Optional.ofNullable(roleAndCredentialSourceBasedProfileCredentialsProvider());
+                return Optional.of(roleAndCredentialSourceBasedProfileCredentialsProvider());
             }
         }
 
         if (properties.containsKey(ProfileProperty.CREDENTIAL_PROCESS)) {
-            return Optional.ofNullable(credentialProcessCredentialsProvider());
+            return Optional.of(credentialProcessCredentialsProvider());
         }
 
         if (properties.containsKey(ProfileProperty.AWS_SESSION_TOKEN)) {