feat: emit accountId metrics (#1551)

xinsong-cui · web-flow · commit 9adc647f85cc · 2025-03-14T17:14:00.000-04:00
* emit business metrics

* smithy kotlin version bump

* pr feedback &amp; smithy version bump

* pr feedback

* bump smithy version
diff --git a/aws-runtime/aws-config/api/aws-config.api b/aws-runtime/aws-config/api/aws-config.api
@@ -307,6 +307,10 @@ public final class aws/sdk/kotlin/runtime/config/endpoints/AccountIdEndpointMode
 	public static fun values ()[Laws/sdk/kotlin/runtime/config/endpoints/AccountIdEndpointMode;
 }
 
+public final class aws/sdk/kotlin/runtime/config/endpoints/AccountIdEndpointModeKt {
+	public static final fun toBusinessMetric (Laws/sdk/kotlin/runtime/config/endpoints/AccountIdEndpointMode;)Laws/smithy/kotlin/runtime/businessmetrics/BusinessMetric;
+}
+
 public final class aws/sdk/kotlin/runtime/config/endpoints/ResolversKt {
 	public static final fun resolveAccountId (Laws/sdk/kotlin/runtime/config/endpoints/AccountIdEndpointMode;Laws/smithy/kotlin/runtime/collections/Attributes;)Ljava/lang/String;
 	public static final fun resolveAccountIdEndpointMode (Laws/smithy/kotlin/runtime/util/PlatformProvider;Laws/smithy/kotlin/runtime/util/LazyAsyncValue;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/endpoints/AccountIdEndpointMode.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/endpoints/AccountIdEndpointMode.kt
@@ -4,6 +4,10 @@
  */
 package aws.sdk.kotlin.runtime.config.endpoints
 
+import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.businessmetrics.BusinessMetric
+import aws.smithy.kotlin.runtime.businessmetrics.SmithyBusinessMetric
+
 /**
  * Controls how the account ID endpoint parameter is bound for services that support routing
  * endpoints based on it.
@@ -25,3 +29,11 @@ public enum class AccountIdEndpointMode {
      */
     REQUIRED,
 }
+
+@InternalApi
+public fun AccountIdEndpointMode.toBusinessMetric(): BusinessMetric = when (this) {
+    AccountIdEndpointMode.PREFERRED -> SmithyBusinessMetric.ACCOUNT_ID_MODE_PREFERRED
+    AccountIdEndpointMode.DISABLED -> SmithyBusinessMetric.ACCOUNT_ID_MODE_DISABLED
+    AccountIdEndpointMode.REQUIRED -> SmithyBusinessMetric.ACCOUNT_ID_MODE_REQUIRED
+    else -> throw IllegalStateException("Unexpected AccountIdEndpointMode value: ${this::class.simpleName}")
+}
diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsRuntimeTypes.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/AwsRuntimeTypes.kt
@@ -19,6 +19,7 @@ object AwsRuntimeTypes {
 
         object Client : RuntimeTypePackage(AwsKotlinDependency.AWS_CORE, "client") {
             val AwsSdkClientConfig = symbol("AwsSdkClientConfig")
+            val AwsClientOption = symbol("AwsClientOption")
         }
     }
 
@@ -41,6 +42,7 @@ object AwsRuntimeTypes {
             val resolveEndpointUrl = symbol("resolveEndpointUrl")
             val resolveAccountId = symbol("resolveAccountId")
             val resolveAccountIdEndpointMode = symbol("resolveAccountIdEndpointMode")
+            val toBusinessMetric = symbol("toBusinessMetric")
         }
 
         object Profile : RuntimeTypePackage(AwsKotlinDependency.AWS_CONFIG, "config.profile") {
diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/businessmetrics/EndpointBusinessMetricsIntegration.kt
@@ -38,6 +38,12 @@ class EndpointBusinessMetricsIntegration : KotlinIntegration {
             RuntimeTypes.Core.BusinessMetrics.emitBusinessMetric,
             AwsRuntimeTypes.Http.Interceptors.BusinessMetrics.AwsBusinessMetric,
         )
+        writer.write(
+            "if (request.identity.attributes.contains(#T.AccountId)) request.context.#T(#T.RESOLVED_ACCOUNT_ID)",
+            AwsRuntimeTypes.Core.Client.AwsClientOption,
+            RuntimeTypes.Core.BusinessMetrics.emitBusinessMetric,
+            RuntimeTypes.Core.BusinessMetrics.SmithyBusinessMetric,
+        )
         writer.write("")
     }
 }
diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/AccountIdEndpointBuiltinCustomization.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/AccountIdEndpointBuiltinCustomization.kt
@@ -9,14 +9,18 @@ import aws.sdk.kotlin.codegen.ServiceClientCompanionObjectWriter
 import aws.sdk.kotlin.codegen.endpoints.AwsBuiltins
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
 import software.amazon.smithy.kotlin.codegen.core.CodegenContext
+import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
 import software.amazon.smithy.kotlin.codegen.integration.AppendingSectionWriter
 import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
 import software.amazon.smithy.kotlin.codegen.integration.SectionWriterBinding
 import software.amazon.smithy.kotlin.codegen.model.expectShape
 import software.amazon.smithy.kotlin.codegen.model.getEndpointRules
+import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
+import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolMiddleware
 import software.amazon.smithy.kotlin.codegen.rendering.util.ConfigProperty
 import software.amazon.smithy.kotlin.codegen.rendering.util.ConfigPropertyType
 import software.amazon.smithy.model.Model
+import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.model.shapes.ServiceShape
 
 /**
@@ -59,4 +63,20 @@ class AccountIdEndpointBuiltinCustomization : KotlinIntegration {
 
     override fun additionalServiceConfigProps(ctx: CodegenContext): List<ConfigProperty> =
         listOf(AccountIdEndpointModeProp)
+
+    override fun customizeMiddleware(
+        ctx: ProtocolGenerator.GenerationContext,
+        resolved: List<ProtocolMiddleware>,
+    ): List<ProtocolMiddleware> = resolved + listOf(emitAccountIdEndpointModeMiddleware)
+}
+
+private val emitAccountIdEndpointModeMiddleware = object : ProtocolMiddleware {
+    override val name: String = "EmitAccountIdEndpointModeMiddleware"
+
+    override fun render(ctx: ProtocolGenerator.GenerationContext, op: OperationShape, writer: KotlinWriter) {
+        writer.write(
+            "op.context.emitBusinessMetric(config.accountIdEndpointMode.#T())",
+            AwsRuntimeTypes.Config.Endpoints.toBusinessMetric,
+        )
+    }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,8 +12,8 @@ atomicfu-version = "0.25.0"
 binary-compatibility-validator-version = "0.16.3"
 
 # smithy-kotlin codegen and runtime are versioned separately
-smithy-kotlin-runtime-version = "1.4.9"
-smithy-kotlin-codegen-version = "0.34.9"
+smithy-kotlin-runtime-version = "1.4.11"
+smithy-kotlin-codegen-version = "0.34.11"
 
 # codegen
 smithy-version = "1.53.0"

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ object AwsRuntimeTypes {`
`19`	`19`
`20`	`20`	`object Client : RuntimeTypePackage(AwsKotlinDependency.AWS_CORE, "client") {`
`21`	`21`	`val AwsSdkClientConfig = symbol("AwsSdkClientConfig")`
	`22`	`+ val AwsClientOption = symbol("AwsClientOption")`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`
`@@ -41,6 +42,7 @@ object AwsRuntimeTypes {`
`41`	`42`	`val resolveEndpointUrl = symbol("resolveEndpointUrl")`
`42`	`43`	`val resolveAccountId = symbol("resolveAccountId")`
`43`	`44`	`val resolveAccountIdEndpointMode = symbol("resolveAccountIdEndpointMode")`
	`45`	`+ val toBusinessMetric = symbol("toBusinessMetric")`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`object Profile : RuntimeTypePackage(AwsKotlinDependency.AWS_CONFIG, "config.profile") {`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,12 @@ class EndpointBusinessMetricsIntegration : KotlinIntegration {`
`38`	`38`	`RuntimeTypes.Core.BusinessMetrics.emitBusinessMetric,`
`39`	`39`	`AwsRuntimeTypes.Http.Interceptors.BusinessMetrics.AwsBusinessMetric,`
`40`	`40`	`)`
	`41`	`+ writer.write(`
	`42`	`+ "if (request.identity.attributes.contains(#T.AccountId)) request.context.#T(#T.RESOLVED_ACCOUNT_ID)",`
	`43`	`+ AwsRuntimeTypes.Core.Client.AwsClientOption,`
	`44`	`+ RuntimeTypes.Core.BusinessMetrics.emitBusinessMetric,`
	`45`	`+ RuntimeTypes.Core.BusinessMetrics.SmithyBusinessMetric,`
	`46`	`+ )`
`41`	`47`	`writer.write("")`
`42`	`48`	`}`
`43`	`49`	`}`