addressing PR feedback: improve changelog message, shorten some names

Author: ianbotsf

.changes/3456d00f-1b29-4d88-ab02-045db1b1ebce.json

@@ -1,7 +1,7 @@
 {
     "id": "3456d00f-1b29-4d88-ab02-045db1b1ebce",
     "type": "bugfix",
-    "description": "Include more information when retry strategy halts early due to capacity errors",
+    "description": "Include more information when retry strategy halts early due to token bucket capacity errors",
     "issues": [
         "awslabs/aws-sdk-kotlin#1321"
     ]

runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/Exceptions.kt

@@ -54,8 +54,8 @@ public open class ErrorMetadata {
         /**
          * Set if there are additional context elements about the error
          */
-        public val AdditionalClientContext: AttributeKey<List<ClientErrorContext>> =
-            AttributeKey("aws.smithy.kotlin#AdditionalClientContext")
+        public val ClientContext: AttributeKey<List<ClientErrorContext>> =
+            AttributeKey("aws.smithy.kotlin#ClientContext")
 
         /**
          * Set if an error is retryable
@@ -74,8 +74,8 @@ public open class ErrorMetadata {
     public val isThrottling: Boolean
         get() = attributes.getOrNull(ThrottlingError) ?: false
 
-    public val additionalClientContext: List<ClientErrorContext>
-        get() = attributes.getOrNull(AdditionalClientContext).orEmpty()
+    public val clientContext: List<ClientErrorContext>
+        get() = attributes.getOrNull(ClientContext).orEmpty()
 }
 
 /**
@@ -213,7 +213,7 @@ public open class ServiceException : SdkBaseException {
 
             sdkErrorMetadata.requestId?.let { add("Request ID: $it") }
 
-            sdkErrorMetadata.additionalClientContext.mapTo(this@buildList) { it.formatted }
+            sdkErrorMetadata.clientContext.mapTo(this@buildList) { it.formatted }
         }
 
     override val message: String

runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/retries/StandardRetryStrategy.kt

@@ -156,7 +156,7 @@ public open class StandardRetryStrategy(override val config: Config = Config.def
 
             is ServiceException -> retryableException.apply {
                 val addCtx = ClientErrorContext("Early retry termination", capacityMessage)
-                sdkErrorMetadata.attributes.appendValue(ErrorMetadata.AdditionalClientContext, addCtx)
+                sdkErrorMetadata.attributes.appendValue(ErrorMetadata.ClientContext, addCtx)
             }
 
             else -> retryableException

runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/ExceptionsTest.kt

@@ -113,8 +113,8 @@ class ExceptionsTest {
     @Test
     fun testNoMessageWithClientContext() {
         val e = FooServiceException {
-            appendValue(ErrorMetadata.AdditionalClientContext, ClientErrorContext(CTX_KEY_1, CTX_VALUE_1))
-            appendValue(ErrorMetadata.AdditionalClientContext, ClientErrorContext(CTX_KEY_2, CTX_VALUE_2))
+            appendValue(ErrorMetadata.ClientContext, ClientErrorContext(CTX_KEY_1, CTX_VALUE_1))
+            appendValue(ErrorMetadata.ClientContext, ClientErrorContext(CTX_KEY_2, CTX_VALUE_2))
         }
         assertEquals(
             buildList {
@@ -130,8 +130,8 @@ class ExceptionsTest {
     @Test
     fun testMessageWithClientContext() {
         val e = FooServiceException(SERVICE_MESSAGE) {
-            appendValue(ErrorMetadata.AdditionalClientContext, ClientErrorContext(CTX_KEY_1, CTX_VALUE_1))
-            appendValue(ErrorMetadata.AdditionalClientContext, ClientErrorContext(CTX_KEY_2, CTX_VALUE_2))
+            appendValue(ErrorMetadata.ClientContext, ClientErrorContext(CTX_KEY_1, CTX_VALUE_1))
+            appendValue(ErrorMetadata.ClientContext, ClientErrorContext(CTX_KEY_2, CTX_VALUE_2))
         }
         assertEquals(
             "$SERVICE_MESSAGE, $CTX_KEY_1: $CTX_VALUE_1, $CTX_KEY_2: $CTX_VALUE_2",