Remove breaking changes

Author: 0marperez

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

@@ -82,14 +82,14 @@ 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/collections/Attributes;Laws/smithy/kotlin/runtime/businessmetrics/BusinessMetric;)Z
-	public static final fun emitBusinessMetric (Laws/smithy/kotlin/runtime/collections/MutableAttributes;Laws/smithy/kotlin/runtime/businessmetrics/BusinessMetric;)V
+	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 emitBusinessMetrics (Laws/smithy/kotlin/runtime/collections/MutableAttributes;Ljava/util/Set;)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;
-	public static final fun removeBusinessMetric (Laws/smithy/kotlin/runtime/collections/MutableAttributes;Laws/smithy/kotlin/runtime/businessmetrics/BusinessMetric;)V
+	public static final fun removeBusinessMetric (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Laws/smithy/kotlin/runtime/businessmetrics/BusinessMetric;)V
 }
 
 public final class aws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric : java/lang/Enum, aws/smithy/kotlin/runtime/businessmetrics/BusinessMetric {

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

@@ -5,7 +5,10 @@
 package aws.smithy.kotlin.runtime.businessmetrics
 
 import aws.smithy.kotlin.runtime.InternalApi
-import aws.smithy.kotlin.runtime.collections.*
+import aws.smithy.kotlin.runtime.collections.AttributeKey
+import aws.smithy.kotlin.runtime.collections.MutableAttributes
+import aws.smithy.kotlin.runtime.collections.get
+import aws.smithy.kotlin.runtime.operation.ExecutionContext
 
 /**
  * Keeps track of all business metrics along an operations execution
@@ -26,49 +29,57 @@ public val AccountIdBasedEndpointAccountId: AttributeKey<String> = AttributeKey(
 public val ServiceEndpointOverride: AttributeKey<Boolean> = AttributeKey("aws.smithy.kotlin#ServiceEndpointOverride")
 
 /**
- * Emits a business metric into [MutableAttributes]
- * @param identifier The identifier of the [BusinessMetric] to be emitted.
+ * Emit a business metric to the execution context attributes
  */
 @InternalApi
-public fun MutableAttributes.emitBusinessMetric(identifier: String) {
-    if (this.contains(BusinessMetrics)) {
-        this[BusinessMetrics].add(identifier)
+public fun ExecutionContext.emitBusinessMetric(metric: BusinessMetric) {
+    if (this.attributes.contains(BusinessMetrics)) {
+        this.attributes[BusinessMetrics].add(metric.identifier)
     } else {
-        this[BusinessMetrics] = mutableSetOf(identifier)
+        this.attributes[BusinessMetrics] = mutableSetOf(metric.identifier)
     }
 }
 
 /**
- * Emits a business metric into [MutableAttributes]
- * @param metric The [BusinessMetric] to be emitted.
+ * Emit a business metric to the execution context attributes using its identifier
  */
 @InternalApi
-public fun MutableAttributes.emitBusinessMetric(metric: BusinessMetric): Unit = this.emitBusinessMetric(metric.identifier)
+public fun ExecutionContext.emitBusinessMetric(identifier: String) {
+    if (this.attributes.contains(BusinessMetrics)) {
+        this.attributes[BusinessMetrics].add(identifier)
+    } else {
+        this.attributes[BusinessMetrics] = mutableSetOf(identifier)
+    }
+}
 
 /**
- * Emits business metrics into [MutableAttributes]
- * @param metrics The [BusinessMetric]s to be emitted.
+ * Emit a business metric to the mutable attributes
  */
 @InternalApi
-public fun MutableAttributes.emitBusinessMetrics(metrics: Set<BusinessMetric>): Unit =
-    metrics.forEach { emitBusinessMetric(it) }
+public fun MutableAttributes.emitBusinessMetric(identifier: String) {
+    if (this.contains(BusinessMetrics)) {
+        this[BusinessMetrics].add(identifier)
+    } else {
+        this[BusinessMetrics] = mutableSetOf(identifier)
+    }
+}
 
 /**
- * Removes a business metric from the [MutableAttributes]
+ * Removes a business metric from the execution context attributes
  */
 @InternalApi
-public fun MutableAttributes.removeBusinessMetric(metric: BusinessMetric) {
-    if (this.contains(BusinessMetrics)) {
-        this[BusinessMetrics].remove(metric.identifier)
+public fun ExecutionContext.removeBusinessMetric(metric: BusinessMetric) {
+    if (this.attributes.contains(BusinessMetrics)) {
+        this.attributes[BusinessMetrics].remove(metric.identifier)
     }
 }
 
 /**
- * Checks if a business metric exists in the [Attributes]
+ * Checks if a business metric exists in the execution context attributes
  */
 @InternalApi
-public fun Attributes.containsBusinessMetric(metric: BusinessMetric): Boolean =
-    (this.contains(BusinessMetrics)) && this[BusinessMetrics].contains(metric.identifier)
+public fun ExecutionContext.containsBusinessMetric(metric: BusinessMetric): Boolean =
+    (this.attributes.contains(BusinessMetrics)) && this.attributes[BusinessMetrics].contains(metric.identifier)
 
 /**
  * Valid business metrics