Revert "feat: business metrics (#1317)"

This reverts commit 658a859.
awslabs · Jun 18, 2024 · e4b3b62 · e4b3b62
1 parent 30f3e5d
commit e4b3b62
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 295 deletions.
diff --git a/aws-runtime/aws-http/api/aws-http.api b/aws-runtime/aws-http/api/aws-http.api
@@ -48,7 +48,6 @@ public final class aws/sdk/kotlin/runtime/http/AwsUserAgentMetadata$Companion {
 public final class aws/sdk/kotlin/runtime/http/AwsUserAgentMetadataKt {
 	public static final field AWS_APP_ID_ENV Ljava/lang/String;
 	public static final field AWS_APP_ID_PROP Ljava/lang/String;
-	public static final field BUSINESS_METRICS_MAX_LENGTH I
 }
 
 public final class aws/sdk/kotlin/runtime/http/ExecutionEnvMetadata {
@@ -140,14 +139,6 @@ public final class aws/sdk/kotlin/runtime/http/interceptors/AddUserAgentMetadata
 	public fun readBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
 }
 
-public final class aws/sdk/kotlin/runtime/http/interceptors/AwsBusinessMetric : java/lang/Enum, aws/smithy/kotlin/runtime/businessmetrics/BusinessMetric {
-	public static final field S3_EXPRESS_BUCKET Laws/sdk/kotlin/runtime/http/interceptors/AwsBusinessMetric;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public fun getIdentifier ()Ljava/lang/String;
-	public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/runtime/http/interceptors/AwsBusinessMetric;
-	public static fun values ()[Laws/sdk/kotlin/runtime/http/interceptors/AwsBusinessMetric;
-}
-
 public final class aws/sdk/kotlin/runtime/http/interceptors/AwsSpanInterceptor : aws/smithy/kotlin/runtime/client/Interceptor {
 	public static final field INSTANCE Laws/sdk/kotlin/runtime/http/interceptors/AwsSpanInterceptor;
 	public fun modifyBeforeAttemptCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -171,29 +162,6 @@ public final class aws/sdk/kotlin/runtime/http/interceptors/AwsSpanInterceptor :
 	public fun readBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
 }
 
-public final class aws/sdk/kotlin/runtime/http/interceptors/BusinessMetricsInterceptor : aws/smithy/kotlin/runtime/client/Interceptor {
-	public fun <init> ()V
-	public fun modifyBeforeAttemptCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun modifyBeforeCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun modifyBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun modifyBeforeRetryLoop (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun modifyBeforeSerialization (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun modifyBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun modifyBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun readAfterAttempt (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
-	public fun readAfterDeserialization (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
-	public fun readAfterExecution (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
-	public fun readAfterSerialization (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-	public fun readAfterSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-	public fun readAfterTransmit (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
-	public fun readBeforeAttempt (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-	public fun readBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
-	public fun readBeforeExecution (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
-	public fun readBeforeSerialization (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
-	public fun readBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-	public fun readBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-}
-
 public final class aws/sdk/kotlin/runtime/http/interceptors/UnsupportedSigningAlgorithmInterceptor : aws/smithy/kotlin/runtime/client/Interceptor {
 	public fun <init> ()V
 	public fun modifyBeforeAttemptCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

diff --git a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/AwsUserAgentMetadata.kt b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/AwsUserAgentMetadata.kt
@@ -14,8 +14,6 @@ import kotlin.jvm.JvmInline
 
 internal const val AWS_EXECUTION_ENV = "AWS_EXECUTION_ENV"
 public const val AWS_APP_ID_ENV: String = "AWS_SDK_UA_APP_ID"
-private const val USER_AGENT_SPEC_VERSION = "2.1"
-public const val BUSINESS_METRICS_MAX_LENGTH: Int = 1024
 
 // non-standard environment variables/properties
 public const val AWS_APP_ID_PROP: String = "aws.userAgentAppId"
@@ -67,7 +65,7 @@ public data class AwsUserAgentMetadata(
         get() = buildList {
             add(sdkMetadata)
             customMetadata?.extras?.takeIf { it.containsKey("internal") }?.let { add("md/internal") }
-            add(uaPair("ua", USER_AGENT_SPEC_VERSION))
+            add(uaPair("ua", "2.0")) // User agent specification version 2.0
             add(apiMetadata)
             add(osMetadata)
             add(languageMetadata)

diff --git a/...ws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/BusinessMetricsInterceptor.kt b/...ws-http/common/src/aws/sdk/kotlin/runtime/http/interceptors/BusinessMetricsInterceptor.kt
diff --git a/aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/AwsUserAgentMetadataTest.kt b/aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/AwsUserAgentMetadataTest.kt
@@ -45,7 +45,7 @@ class AwsUserAgentMetadataTest {
         val expected = listOf(
             "aws-sdk-kotlin/1.2.3",
             "md/internal",
-            "ua/2.1",
+            "ua/2.0",
             "api/test-service#1.2.3",
             "os/linux#ubuntu-20.04",
             "lang/kotlin#1.4.31",

diff --git a/...tp/common/test/aws/sdk/kotlin/runtime/http/interceptors/BusinessMetricsInterceptorTest.kt b/...tp/common/test/aws/sdk/kotlin/runtime/http/interceptors/BusinessMetricsInterceptorTest.kt
diff --git a/aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/middleware/UserAgentTest.kt b/aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/middleware/UserAgentTest.kt
@@ -47,7 +47,7 @@ class UserAgentTest {
         assertTrue(request.headers.contains(X_AMZ_USER_AGENT))
         assertEquals("aws-sdk-kotlin/1.2.3", request.headers[X_AMZ_USER_AGENT])
         assertTrue(
-            request.headers[USER_AGENT]!!.startsWith("aws-sdk-kotlin/1.2.3 ua/2.1 api/test-service#1.2.3"),
+            request.headers[USER_AGENT]!!.startsWith("aws-sdk-kotlin/1.2.3 ua/2.0 api/test-service#1.2.3"),
             "$USER_AGENT header didn't start with expected value. Found: ${request.headers[USER_AGENT]}",
         )
     }

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
@@ -60,8 +60,6 @@ object AwsRuntimeTypes {
         object Interceptors : RuntimeTypePackage(AwsKotlinDependency.AWS_HTTP, "interceptors") {
             val AddUserAgentMetadataInterceptor = symbol("AddUserAgentMetadataInterceptor")
             val UnsupportedSigningAlgorithmInterceptor = symbol("UnsupportedSigningAlgorithmInterceptor")
-            val BusinessMetricsInterceptor = symbol("BusinessMetricsInterceptor")
-            val AwsBusinessMetric = symbol("AwsBusinessMetric")
         }
 
         object Retries {

diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/BusinessMetricsIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/BusinessMetricsIntegration.kt
diff --git a/...ces/META-INF/services/software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration b/...ces/META-INF/services/software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
@@ -42,4 +42,3 @@ aws.sdk.kotlin.codegen.customization.cloudfrontkeyvaluestore.BackfillSigV4ACusto
 aws.sdk.kotlin.codegen.customization.s3.express.SigV4S3ExpressAuthSchemeIntegration
 aws.sdk.kotlin.codegen.customization.s3.express.S3ExpressIntegration
 aws.sdk.kotlin.codegen.customization.s3.S3ExpiresIntegration
-aws.sdk.kotlin.codegen.BusinessMetricsIntegration
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,8 +9,8 @@ coroutines-version = "1.7.3"
 atomicfu-version = "0.23.1"
 
 # smithy-kotlin codegen and runtime are versioned separately
-smithy-kotlin-runtime-version = "1.2.9"
-smithy-kotlin-codegen-version = "0.32.9"
+smithy-kotlin-runtime-version = "1.2.7"
+smithy-kotlin-codegen-version = "0.32.7"
 
 # codegen
 smithy-version = "1.49.0"