misc: credentials search precedence change (#1162)

Author: 0marperez

runtime/auth/aws-credentials/api/aws-credentials.api

@@ -3,6 +3,7 @@ public final class aws/smithy/kotlin/runtime/auth/awscredentials/CachedCredentia
 	public synthetic fun <init> (Laws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProvider;JJLaws/smithy/kotlin/runtime/time/Clock;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun close ()V
 	public fun resolve (Laws/smithy/kotlin/runtime/collections/Attributes;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class aws/smithy/kotlin/runtime/auth/awscredentials/CachedCredentialsProviderKt {
@@ -45,6 +46,7 @@ public final class aws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProv
 	public fun <init> (Ljava/util/List;)V
 	public fun <init> ([Laws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProvider;)V
 	public fun resolve (Laws/smithy/kotlin/runtime/collections/Attributes;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun toString ()Ljava/lang/String;
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProviderConfig {
@@ -61,6 +63,10 @@ public final class aws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProv
 	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
+public final class aws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProviderKt {
+	public static final fun getSimpleClassName (Laws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProvider;)Ljava/lang/String;
+}
+
 public abstract interface class aws/smithy/kotlin/runtime/auth/awscredentials/SigV4aClientConfig {
 	public abstract fun getSigV4aSigningRegionSet ()Ljava/util/Set;
 }

runtime/auth/aws-credentials/common/src/aws/smithy/kotlin/runtime/auth/awscredentials/CachedCredentialsProvider.kt

@@ -73,6 +73,8 @@ public class CachedCredentialsProvider(
         cachedCredentials.close()
         source.closeIfCloseable()
     }
+
+    override fun toString(): String = this.simpleClassName + ": " + this.source.simpleClassName
 }
 
 /**

runtime/auth/aws-credentials/common/src/aws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProvider.kt

@@ -27,3 +27,14 @@ public interface CredentialsProvider : IdentityProvider {
 public interface CloseableCredentialsProvider :
     CredentialsProvider,
     Closeable
+
+/**
+ * Retrieves the simple name of the class implementing [CredentialsProvider].
+ *
+ * This property uses Kotlin reflection to obtain the simple class name of
+ * the current instance of [CredentialsProvider]. The simple class name is
+ * the name of the class without the package qualification (e.g., "MyCredentialsProvider"
+ * instead of "com.example.MyCredentialsProvider").
+ */
+public val CredentialsProvider.simpleClassName: String
+    get() = this::class.simpleName ?: "AnonymousCredentialsProvider"

runtime/auth/aws-credentials/common/src/aws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProviderChain.kt

@@ -21,4 +21,6 @@ public class CredentialsProviderChain(vararg providers: CredentialsProvider) :
     public constructor(providers: List<CredentialsProvider>) : this(*providers.toTypedArray())
 
     override suspend fun resolve(attributes: Attributes): Credentials = super.resolve(attributes)
+
+    override fun toString(): String = providers.joinToString(" -> ")
 }

runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/SdkOperationExecution.kt

@@ -6,6 +6,7 @@
 package aws.smithy.kotlin.runtime.http.operation
 
 import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.businessmetrics.BusinessMetrics
 import aws.smithy.kotlin.runtime.businessmetrics.SmithyBusinessMetric
 import aws.smithy.kotlin.runtime.businessmetrics.emitBusinessMetric
 import aws.smithy.kotlin.runtime.client.LogMode
@@ -23,9 +24,11 @@ import aws.smithy.kotlin.runtime.http.request.dumpRequest
 import aws.smithy.kotlin.runtime.http.request.immutableView
 import aws.smithy.kotlin.runtime.http.request.toBuilder
 import aws.smithy.kotlin.runtime.http.response.dumpResponse
+import aws.smithy.kotlin.runtime.identity.Identity
 import aws.smithy.kotlin.runtime.io.Handler
 import aws.smithy.kotlin.runtime.io.middleware.Middleware
 import aws.smithy.kotlin.runtime.io.middleware.Phase
+import aws.smithy.kotlin.runtime.operation.ExecutionContext
 import aws.smithy.kotlin.runtime.retries.RetryStrategy
 import aws.smithy.kotlin.runtime.retries.StandardRetryStrategy
 import aws.smithy.kotlin.runtime.retries.policy.RetryPolicy
@@ -285,6 +288,9 @@ internal class AuthHandler<Input, Output>(
             identityProvider.resolve(request.context)
         }
 
+        // emit identity business metrics
+        emitIdentityBusinessMetrics(identity, request.context)
+
         val resolveEndpointReq = ResolveEndpointRequest(request.context, request.subject.immutableView(), identity)
 
         if (endpointResolver != null) {
@@ -408,3 +414,9 @@ private class InterceptorTransmitMiddleware<I, O>(
         return call
     }
 }
+
+/**
+ * Emits an [Identity]'s attributes' [BusinessMetrics] into the [ExecutionContext]
+ */
+private fun emitIdentityBusinessMetrics(identity: Identity, context: ExecutionContext) =
+    identity.attributes.getOrNull(BusinessMetrics)?.toList()?.reversed()?.forEach(context::emitBusinessMetric)

runtime/runtime-core/api/runtime-core.api

@@ -83,6 +83,7 @@ public abstract interface class aws/smithy/kotlin/runtime/businessmetrics/Busine
 
 public final class aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtilsKt {
 	public static final fun containsBusinessMetric (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Laws/smithy/kotlin/runtime/businessmetrics/BusinessMetric;)Z
+	public static final fun emitBusinessMetric (Laws/smithy/kotlin/runtime/collections/MutableAttributes;Laws/smithy/kotlin/runtime/businessmetrics/BusinessMetric;)V
 	public static final fun emitBusinessMetric (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Laws/smithy/kotlin/runtime/businessmetrics/BusinessMetric;)V
 	public static final fun getAccountIdBasedEndpointAccountId ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 	public static final fun getBusinessMetrics ()Laws/smithy/kotlin/runtime/collections/AttributeKey;

runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt

@@ -6,14 +6,15 @@ package aws.smithy.kotlin.runtime.businessmetrics
 
 import aws.smithy.kotlin.runtime.InternalApi
 import aws.smithy.kotlin.runtime.collections.AttributeKey
+import aws.smithy.kotlin.runtime.collections.MutableAttributes
 import aws.smithy.kotlin.runtime.collections.get
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
 
 /**
  * Keeps track of all business metrics along an operations execution
  */
 @InternalApi
-public val BusinessMetrics: AttributeKey<MutableSet<String>> = AttributeKey("aws.sdk.kotlin#BusinessMetrics")
+public val BusinessMetrics: AttributeKey<MutableSet<BusinessMetric>> = AttributeKey("aws.smithy.kotlin#BusinessMetrics")
 
 /**
  * The account ID in an account ID based endpoint
@@ -33,9 +34,21 @@ public val ServiceEndpointOverride: AttributeKey<Boolean> = AttributeKey("aws.sm
 @InternalApi
 public fun ExecutionContext.emitBusinessMetric(metric: BusinessMetric) {
     if (this.attributes.contains(BusinessMetrics)) {
-        this.attributes[BusinessMetrics].add(metric.identifier)
+        this.attributes[BusinessMetrics].add(metric)
     } else {
-        this.attributes[BusinessMetrics] = mutableSetOf(metric.identifier)
+        this.attributes[BusinessMetrics] = mutableSetOf(metric)
+    }
+}
+
+/**
+ * Emit a business metric to the mutable attributes
+ */
+@InternalApi
+public fun MutableAttributes.emitBusinessMetric(metric: BusinessMetric) {
+    if (this.contains(BusinessMetrics)) {
+        this[BusinessMetrics].add(metric)
+    } else {
+        this[BusinessMetrics] = mutableSetOf(metric)
     }
 }
 
@@ -45,7 +58,7 @@ public fun ExecutionContext.emitBusinessMetric(metric: BusinessMetric) {
 @InternalApi
 public fun ExecutionContext.removeBusinessMetric(metric: BusinessMetric) {
     if (this.attributes.contains(BusinessMetrics)) {
-        this.attributes[BusinessMetrics].remove(metric.identifier)
+        this.attributes[BusinessMetrics].remove(metric)
     }
 }
 
@@ -54,7 +67,7 @@ public fun ExecutionContext.removeBusinessMetric(metric: BusinessMetric) {
  */
 @InternalApi
 public fun ExecutionContext.containsBusinessMetric(metric: BusinessMetric): Boolean =
-    (this.attributes.contains(BusinessMetrics)) && this.attributes[BusinessMetrics].contains(metric.identifier)
+    (this.attributes.contains(BusinessMetrics)) && this.attributes[BusinessMetrics].contains(metric)
 
 /**
  * Valid business metrics

runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtilsTest.kt

@@ -17,7 +17,7 @@ class BusinessMetricsUtilsTest {
         executionContext.emitBusinessMetric(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION)
 
         assertTrue(executionContext.attributes.contains(BusinessMetrics))
-        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION.identifier))
+        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION))
     }
 
     @Test
@@ -27,8 +27,8 @@ class BusinessMetricsUtilsTest {
         executionContext.emitBusinessMetric(SmithyBusinessMetric.SIGV4A_SIGNING)
 
         assertTrue(executionContext.attributes.contains(BusinessMetrics))
-        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION.identifier))
-        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.SIGV4A_SIGNING.identifier))
+        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION))
+        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.SIGV4A_SIGNING))
     }
 
     @Test
@@ -37,12 +37,12 @@ class BusinessMetricsUtilsTest {
         executionContext.emitBusinessMetric(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION)
 
         assertTrue(executionContext.attributes.contains(BusinessMetrics))
-        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION.identifier))
+        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION))
 
         executionContext.removeBusinessMetric(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION)
 
         assertTrue(executionContext.attributes.contains(BusinessMetrics))
-        assertFalse(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION.identifier))
+        assertFalse(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION))
     }
 
     @Test