misc: track business metrics change from set of string to set of business metrics (#1458)

Author: 0marperez

aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/BusinessMetricsInterceptor.kt

@@ -35,9 +35,9 @@ public class BusinessMetricsInterceptor : HttpInterceptor {
 /**
  * Makes sure the metrics do not exceed the maximum size and truncates them if so.
  */
-private fun formatMetrics(metrics: MutableSet<String>): String {
+private fun formatMetrics(metrics: MutableSet<BusinessMetric>): String {
     if (metrics.isEmpty()) return ""
-    val metricsString = metrics.joinToString(",", "m/")
+    val metricsString = metrics.joinToString(",", "m/") { it.identifier }
     val metricsByteArray = metricsString.encodeToByteArray()
 
     if (metricsByteArray.size <= BUSINESS_METRICS_MAX_LENGTH) return metricsString

aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/interceptors/BusinessMetricsInterceptorTest.kt

@@ -6,6 +6,7 @@ package aws.sdk.kotlin.runtime.http.interceptors
 
 import aws.sdk.kotlin.runtime.http.BUSINESS_METRICS_MAX_LENGTH
 import aws.sdk.kotlin.runtime.http.middleware.USER_AGENT
+import aws.smithy.kotlin.runtime.businessmetrics.BusinessMetric
 import aws.smithy.kotlin.runtime.businessmetrics.SmithyBusinessMetric
 import aws.smithy.kotlin.runtime.businessmetrics.emitBusinessMetric
 import aws.smithy.kotlin.runtime.client.ProtocolRequestInterceptorContext
@@ -70,7 +71,11 @@ class BusinessMetricsInterceptorTest {
         executionContext.attributes[aws.smithy.kotlin.runtime.businessmetrics.BusinessMetrics] = mutableSetOf()
 
         for (i in 0..1024) {
-            executionContext.attributes[aws.smithy.kotlin.runtime.businessmetrics.BusinessMetrics].add(i.toString())
+            executionContext.emitBusinessMetric(
+                object : BusinessMetric {
+                    override val identifier: String = i.toString()
+                },
+            )
         }
 
         val rawMetrics = executionContext[aws.smithy.kotlin.runtime.businessmetrics.BusinessMetrics]
@@ -91,9 +96,12 @@ class BusinessMetricsInterceptorTest {
     @Test
     fun malformedBusinessMetrics() = runTest {
         val executionContext = ExecutionContext()
+        val reallyLongMetric = "All work and no play makes Jack a dull boy".repeat(1000)
 
-        executionContext.attributes[aws.smithy.kotlin.runtime.businessmetrics.BusinessMetrics] = mutableSetOf(
-            "A".repeat(BUSINESS_METRICS_MAX_LENGTH),
+        executionContext.attributes.emitBusinessMetric(
+            object : BusinessMetric {
+                override val identifier: String = reallyLongMetric
+            },
         )
 
         val interceptor = BusinessMetricsInterceptor()

gradle/libs.versions.toml

@@ -11,8 +11,8 @@ coroutines-version = "1.9.0"
 atomicfu-version = "0.25.0"
 
 # smithy-kotlin codegen and runtime are versioned separately
-smithy-kotlin-runtime-version = "1.3.18"
-smithy-kotlin-codegen-version = "0.33.18"
+smithy-kotlin-runtime-version = "1.3.19"
+smithy-kotlin-codegen-version = "0.33.19"
 
 # codegen
 smithy-version = "1.51.0"

hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/DynamoDbMapperTest.kt

@@ -79,7 +79,7 @@ class DynamoDbMapperTest : DdbLocalTest() {
 }
 
 private class MetricCapturingInterceptor : HttpInterceptor {
-    private val capturedMetrics = mutableSetOf<String>()
+    private val capturedMetrics = mutableSetOf<BusinessMetric>()
 
     override fun readBeforeTransmit(context: ProtocolRequestInterceptorContext<Any, HttpRequest>) {
         capturedMetrics += context.executionContext[BusinessMetrics]
@@ -88,12 +88,12 @@ private class MetricCapturingInterceptor : HttpInterceptor {
     fun assertMetric(metric: BusinessMetric, exists: Boolean = true) {
         if (exists) {
             assertTrue(
-                metric.identifier in capturedMetrics,
+                metric in capturedMetrics,
                 "Expected metrics to contain $metric. Actual values: $capturedMetrics",
             )
         } else {
             assertFalse(
-                metric.identifier in capturedMetrics,
+                metric in capturedMetrics,
                 "Expected metrics *not* to contain $metric. Actual values: $capturedMetrics",
             )
         }