misc: reset attributes between provider chain attempts

Author: 0marperez

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt

@@ -330,6 +330,7 @@ object RuntimeTypes {
                 val CredentialsProvider = symbol("CredentialsProvider")
                 val CredentialsProviderConfig = symbol("CredentialsProviderConfig")
                 val SigV4aClientConfig = symbol("SigV4aClientConfig")
+                val simpleClassName = symbol("simpleClassName")
             }
         }
 

runtime/auth/identity-api/common/src/aws/smithy/kotlin/runtime/identity/IdentityProviderChain.kt

@@ -6,7 +6,7 @@
 package aws.smithy.kotlin.runtime.identity
 
 import aws.smithy.kotlin.runtime.InternalApi
-import aws.smithy.kotlin.runtime.collections.Attributes
+import aws.smithy.kotlin.runtime.collections.*
 import aws.smithy.kotlin.runtime.io.Closeable
 import aws.smithy.kotlin.runtime.telemetry.logging.logger
 import aws.smithy.kotlin.runtime.telemetry.trace.withSpan
@@ -37,11 +37,16 @@ public abstract class IdentityProviderChain<P : IdentityProvider, I : Identity>(
         val chainException = lazy { IdentityProviderException("No identity could be resolved from the chain: $chain") }
         for (provider in providers) {
             logger.trace { "Attempting to resolve identity from $provider" }
+
+            val attributesAreMutable = attributes is MutableAttributes
+            val attributesSnapshot = if (attributesAreMutable) attributes.copy() else null
+
             try {
                 @Suppress("UNCHECKED_CAST")
                 return@withSpan provider.resolve(attributes) as I
             } catch (ex: Exception) {
                 logger.debug { "unable to resolve identity from $provider: ${ex.message}" }
+                if (attributesAreMutable) (attributes as MutableAttributes).resetTo(attributesSnapshot!!)
                 chainException.value.addSuppressed(ex)
             }
         }

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

@@ -133,6 +133,7 @@ public final class aws/smithy/kotlin/runtime/collections/AttributesBuilder {
 
 public final class aws/smithy/kotlin/runtime/collections/AttributesKt {
 	public static final fun attributesOf (Lkotlin/jvm/functions/Function1;)Laws/smithy/kotlin/runtime/collections/Attributes;
+	public static final fun copy (Laws/smithy/kotlin/runtime/collections/Attributes;)Laws/smithy/kotlin/runtime/collections/Attributes;
 	public static final fun emptyAttributes ()Laws/smithy/kotlin/runtime/collections/Attributes;
 	public static final fun get (Laws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/collections/AttributeKey;)Ljava/lang/Object;
 	public static final fun isNotEmpty (Laws/smithy/kotlin/runtime/collections/Attributes;)Z
@@ -141,6 +142,7 @@ public final class aws/smithy/kotlin/runtime/collections/AttributesKt {
 	public static final fun mutableAttributesOf (Lkotlin/jvm/functions/Function1;)Laws/smithy/kotlin/runtime/collections/MutableAttributes;
 	public static final fun putIfAbsent (Laws/smithy/kotlin/runtime/collections/MutableAttributes;Laws/smithy/kotlin/runtime/collections/AttributeKey;Ljava/lang/Object;)V
 	public static final fun putIfAbsentNotNull (Laws/smithy/kotlin/runtime/collections/MutableAttributes;Laws/smithy/kotlin/runtime/collections/AttributeKey;Ljava/lang/Object;)V
+	public static final fun resetTo (Laws/smithy/kotlin/runtime/collections/MutableAttributes;Laws/smithy/kotlin/runtime/collections/Attributes;)V
 	public static final fun setIfValueNotNull (Laws/smithy/kotlin/runtime/collections/MutableAttributes;Laws/smithy/kotlin/runtime/collections/AttributeKey;Ljava/lang/Object;)V
 	public static final fun take (Laws/smithy/kotlin/runtime/collections/MutableAttributes;Laws/smithy/kotlin/runtime/collections/AttributeKey;)Ljava/lang/Object;
 	public static final fun takeOrNull (Laws/smithy/kotlin/runtime/collections/MutableAttributes;Laws/smithy/kotlin/runtime/collections/AttributeKey;)Ljava/lang/Object;

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

@@ -5,8 +5,7 @@
 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.get
+import aws.smithy.kotlin.runtime.collections.*
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
 
 /**

runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/Attributes.kt

@@ -235,3 +235,27 @@ public inline fun attributesOf(block: AttributesBuilder.() -> Unit): Attributes
  * Returns a new [MutableAttributes] instance with elements from this set of attributes.
  */
 public fun Attributes.toMutableAttributes(): MutableAttributes = AttributesImpl(this)
+
+/**
+ * Creates a copy of this [Attributes] instance.
+ *
+ * This function generates a new [Attributes] instance containing all the key-value pairs
+ * from the current set of attributes. The new instance is independent of the original,
+ * meaning changes to the copied attributes will not affect the original set.
+ */
+public fun Attributes.copy(): Attributes {
+    val copy = mutableAttributes()
+    (this.keys as Set<AttributeKey<Any>>).forEach { key ->
+        copy[key] = this[key]
+    }
+    return copy
+}
+
+/**
+ * Resets this [MutableAttributes] instance to the state of the specified [Attributes].
+ */
+public fun MutableAttributes.resetTo(attributes: Attributes) {
+    val obsoleteKeys = this.keys.subtract(attributes.keys)
+    obsoleteKeys.forEach { key -> this.remove(key as AttributeKey<Any>) }
+    this.merge(attributes)
+}