refactor(rt): remove client option (#1028)

Author: aajtodd

.changes/bee7fe5b-8719-4405-9dbb-88be16774861.json

@@ -0,0 +1,5 @@
+{
+    "id": "bee7fe5b-8719-4405-9dbb-88be16774861",
+    "type": "misc",
+    "description": "Refactor ClientOption to AttributeKey directly and track upstream HttpContext changes"
+}

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/EcsCredentialsProvider.kt

@@ -83,10 +83,8 @@ public class EcsCredentialsProvider internal constructor(
         val op = SdkHttpOperation.build<Unit, Credentials> {
             serializer = EcsCredentialsSerializer(authToken)
             deserializer = EcsCredentialsDeserializer()
-            context {
-                operationName = "EcsCredentialsProvider"
-                serviceName = "EcsContainerMetadata"
-            }
+            operationName = "EcsCredentialsProvider"
+            serviceName = "EcsContainerMetadata"
             execution.endpointResolver = EndpointResolver { Endpoint(url) }
         }
 

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/imds/ImdsClient.kt

@@ -117,10 +117,9 @@ public class ImdsClient private constructor(builder: Builder) : InstanceMetadata
                     }
                 }
             }
+            operationName = path
+            serviceName = "IMDS"
             context {
-                operationName = path
-                serviceName = "IMDS"
-
                 // artifact of re-using ServiceEndpointResolver middleware
                 set(SdkClientOption.LogMode, logMode)
             }

aws-runtime/aws-core/common/src/aws/sdk/kotlin/runtime/client/AwsClientOption.kt

@@ -4,8 +4,7 @@
  */
 
 package aws.sdk.kotlin.runtime.client
-
-import aws.smithy.kotlin.runtime.client.ClientOption
+import aws.smithy.kotlin.runtime.util.AttributeKey
 
 /**
  * A collection of AWS service client options. NOTE: most options are configured by default through the service
@@ -16,5 +15,5 @@ public object AwsClientOption {
      * The AWS region the client should use. Note this is not always the same as [AwsSigningAttributes.SigningRegion] in
      * the case of global services like IAM
      */
-    public val Region: ClientOption<String> = ClientOption("AwsRegion")
+    public val Region: AttributeKey<String> = AttributeKey("AwsRegion")
 }

aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/middleware/AwsRetryHeaderMiddlewareTest.kt

@@ -25,11 +25,8 @@ class AwsRetryHeaderMiddlewareTest {
         val op = SdkHttpOperation.build<Unit, Unit> {
             serializer = UnitSerializer
             deserializer = UnitDeserializer
-            context {
-                // required operation context
-                operationName = "TestOperation"
-                serviceName = "TestService"
-            }
+            operationName = "TestOperation"
+            serviceName = "TestService"
         }
 
         val strategy = StandardRetryStrategy()

aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/middleware/RecursionDetectionTest.kt

@@ -41,10 +41,8 @@ class RecursionDetectionTest {
         val op = SdkHttpOperation.build<Unit, HttpResponse> {
             serializer = if (existingTraceHeader != null) TraceHeaderSerializer(existingTraceHeader) else UnitSerializer
             deserializer = IdentityDeserializer
-            context {
-                operationName = "testOperation"
-                serviceName = "TestService"
-            }
+            operationName = "testOperation"
+            serviceName = "TestService"
         }
 
         val provider = TestPlatformProvider(env)

aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/middleware/UserAgentTest.kt

@@ -31,10 +31,8 @@ class UserAgentTest {
         SdkHttpOperation.build<Unit, HttpResponse> {
             serializer = UnitSerializer
             deserializer = IdentityDeserializer
-            context {
-                operationName = "testOperation"
-                serviceName = "TestService"
-            }
+            operationName = "testOperation"
+            serviceName = "TestService"
         }.apply {
             val apiMd = ApiMetadata("Test Service", "1.2.3")
             val metadata = loadAwsUserAgentMetadataFromEnvironment(platformProvider, apiMd)