Set<String> -> Set<BusinessMetric> business metrics

Author: 0marperez

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

@@ -83,9 +83,8 @@ public abstract interface class aws/smithy/kotlin/runtime/businessmetrics/Busine
 
 public final class aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtilsKt {
 	public static final fun containsBusinessMetric (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Laws/smithy/kotlin/runtime/businessmetrics/BusinessMetric;)Z
-	public static final fun emitBusinessMetric (Laws/smithy/kotlin/runtime/collections/MutableAttributes;Ljava/lang/String;)V
+	public static final fun emitBusinessMetric (Laws/smithy/kotlin/runtime/collections/MutableAttributes;Laws/smithy/kotlin/runtime/businessmetrics/BusinessMetric;)V
 	public static final fun emitBusinessMetric (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Laws/smithy/kotlin/runtime/businessmetrics/BusinessMetric;)V
-	public static final fun emitBusinessMetric (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Ljava/lang/String;)V
 	public static final fun getAccountIdBasedEndpointAccountId ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 	public static final fun getBusinessMetrics ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 	public static final fun getServiceEndpointOverride ()Laws/smithy/kotlin/runtime/collections/AttributeKey;

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

@@ -14,7 +14,7 @@ import aws.smithy.kotlin.runtime.operation.ExecutionContext
  * Keeps track of all business metrics along an operations execution
  */
 @InternalApi
-public val BusinessMetrics: AttributeKey<MutableSet<String>> = AttributeKey("aws.sdk.kotlin#BusinessMetrics")
+public val BusinessMetrics: AttributeKey<MutableSet<BusinessMetric>> = AttributeKey("aws.sdk.kotlin#BusinessMetrics")
 
 /**
  * The account ID in an account ID based endpoint
@@ -34,33 +34,21 @@ public val ServiceEndpointOverride: AttributeKey<Boolean> = AttributeKey("aws.sm
 @InternalApi
 public fun ExecutionContext.emitBusinessMetric(metric: BusinessMetric) {
     if (this.attributes.contains(BusinessMetrics)) {
-        this.attributes[BusinessMetrics].add(metric.identifier)
+        this.attributes[BusinessMetrics].add(metric)
     } else {
-        this.attributes[BusinessMetrics] = mutableSetOf(metric.identifier)
-    }
-}
-
-/**
- * Emit a business metric to the execution context attributes using its identifier
- */
-@InternalApi
-public fun ExecutionContext.emitBusinessMetric(identifier: String) {
-    if (this.attributes.contains(BusinessMetrics)) {
-        this.attributes[BusinessMetrics].add(identifier)
-    } else {
-        this.attributes[BusinessMetrics] = mutableSetOf(identifier)
+        this.attributes[BusinessMetrics] = mutableSetOf(metric)
     }
 }
 
 /**
  * Emit a business metric to the mutable attributes
  */
 @InternalApi
-public fun MutableAttributes.emitBusinessMetric(identifier: String) {
+public fun MutableAttributes.emitBusinessMetric(metric: BusinessMetric) {
     if (this.contains(BusinessMetrics)) {
-        this[BusinessMetrics].add(identifier)
+        this[BusinessMetrics].add(metric)
     } else {
-        this[BusinessMetrics] = mutableSetOf(identifier)
+        this[BusinessMetrics] = mutableSetOf(metric)
     }
 }
 
@@ -70,7 +58,7 @@ public fun MutableAttributes.emitBusinessMetric(identifier: String) {
 @InternalApi
 public fun ExecutionContext.removeBusinessMetric(metric: BusinessMetric) {
     if (this.attributes.contains(BusinessMetrics)) {
-        this.attributes[BusinessMetrics].remove(metric.identifier)
+        this.attributes[BusinessMetrics].remove(metric)
     }
 }
 
@@ -79,7 +67,7 @@ public fun ExecutionContext.removeBusinessMetric(metric: BusinessMetric) {
  */
 @InternalApi
 public fun ExecutionContext.containsBusinessMetric(metric: BusinessMetric): Boolean =
-    (this.attributes.contains(BusinessMetrics)) && this.attributes[BusinessMetrics].contains(metric.identifier)
+    (this.attributes.contains(BusinessMetrics)) && this.attributes[BusinessMetrics].contains(metric)
 
 /**
  * Valid business metrics

runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtilsTest.kt

@@ -17,7 +17,7 @@ class BusinessMetricsUtilsTest {
         executionContext.emitBusinessMetric(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION)
 
         assertTrue(executionContext.attributes.contains(BusinessMetrics))
-        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION.identifier))
+        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION))
     }
 
     @Test
@@ -27,8 +27,8 @@ class BusinessMetricsUtilsTest {
         executionContext.emitBusinessMetric(SmithyBusinessMetric.SIGV4A_SIGNING)
 
         assertTrue(executionContext.attributes.contains(BusinessMetrics))
-        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION.identifier))
-        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.SIGV4A_SIGNING.identifier))
+        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION))
+        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.SIGV4A_SIGNING))
     }
 
     @Test
@@ -37,12 +37,12 @@ class BusinessMetricsUtilsTest {
         executionContext.emitBusinessMetric(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION)
 
         assertTrue(executionContext.attributes.contains(BusinessMetrics))
-        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION.identifier))
+        assertTrue(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION))
 
         executionContext.removeBusinessMetric(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION)
 
         assertTrue(executionContext.attributes.contains(BusinessMetrics))
-        assertFalse(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION.identifier))
+        assertFalse(executionContext.attributes[BusinessMetrics].contains(SmithyBusinessMetric.GZIP_REQUEST_COMPRESSION))
     }
 
     @Test