Fix ktlint formatting, downgrade opentelemetry to 0.24.0, and remove unused observability metrics

Author: vcjana

aws/rust-runtime/Cargo.lock

@@ -165,9 +165,6 @@ iterable_enum!(
     SsoLoginDevice,
     SsoLoginAuth,
     BearerServiceEnvVars,
-    ObservabilityTracing,
-    ObservabilityMetrics,
-    ObservabilityOtelTracing,
     ObservabilityOtelMetrics,
     CredentialsCognito,
     S3TransferUploadDirectory,

aws/rust-runtime/aws-runtime/src/user_agent/metrics.rs

@@ -55,16 +55,13 @@
   "SSO_LOGIN_DEVICE": "1",
   "SSO_LOGIN_AUTH": "2",
   "BEARER_SERVICE_ENV_VARS": "3",
-  "OBSERVABILITY_TRACING" : "4",
-  "OBSERVABILITY_METRICS" : "5",
-  "OBSERVABILITY_OTEL_TRACING" : "6",
-  "OBSERVABILITY_OTEL_METRICS" : "7",
-  "CREDENTIALS_COGNITO" : "8",
-  "S3_TRANSFER_UPLOAD_DIRECTORY" : "9",
-  "S3_TRANSFER_DOWNLOAD_DIRECTORY": "+",
-  "CLI_V1_TO_V2_MIGRATION_DEBUG_MODE" : "-",
-  "LOGIN_SAME_DEVICE" : "AA",
-  "LOGIN_CROSS_DEVICE" : "AB",
-  "CREDENTIALS_PROFILE_LOGIN": "AC",
-  "CREDENTIALS_LOGIN": "AD"
+  "OBSERVABILITY_OTEL_METRICS": "4",
+  "CREDENTIALS_COGNITO": "5",
+  "S3_TRANSFER_UPLOAD_DIRECTORY": "6",
+  "S3_TRANSFER_DOWNLOAD_DIRECTORY": "7",
+  "CLI_V1_TO_V2_MIGRATION_DEBUG_MODE": "8",
+  "LOGIN_SAME_DEVICE": "9",
+  "LOGIN_CROSS_DEVICE": "+",
+  "CREDENTIALS_PROFILE_LOGIN": "-",
+  "CREDENTIALS_LOGIN": "AA"
 }

aws/rust-runtime/aws-runtime/src/user_agent/test_data/feature_id_to_metric_value.json

@@ -30,8 +30,8 @@ bytes = "1.0.0"
 futures-util = { version = "0.3.29", default-features = false }
 http = "0.2"
 http-1x = { package = "http", version = "1" }
-opentelemetry = "0.26.0"
-opentelemetry_sdk = { version = "0.26.0", features = ["testing", "rt-tokio"] }
+opentelemetry = "0.24.0"
+opentelemetry_sdk = { version = "0.24.0", features = ["testing", "rt-tokio"] }
 serde_json = "1.0.0"
 tokio = { version = "1.23.1", features = ["full", "test-util"] }
 tokio-stream = "0.1.5"

aws/sdk/integration-tests/dynamodb/Cargo.toml

@@ -52,7 +52,7 @@ async fn observability_metrics_in_user_agent() {
 
         // Should NOT contain observability metrics when using noop provider
         let ua_str = user_agent.to_str().unwrap();
-        assert!(!ua_str.contains("m/7")); // OBSERVABILITY_OTEL_METRICS = "7"
+        assert!(!ua_str.contains("m/4")); // OBSERVABILITY_OTEL_METRICS = "4"
     }
 
     // Test case 2: OpenTelemetry metrics provider configured
@@ -78,7 +78,7 @@ async fn observability_metrics_in_user_agent() {
         let user_agent = req.headers().get("x-amz-user-agent").unwrap();
 
         // Should contain OBSERVABILITY_OTEL_METRICS metric
-        assert_ua_contains_metric_values(user_agent.to_str().unwrap(), &["7"]);
+        assert_ua_contains_metric_values(user_agent.to_str().unwrap(), &["4"]);
 
         // Reset to noop for other tests
         aws_smithy_observability::global::set_telemetry_provider(TelemetryProvider::noop())

aws/sdk/integration-tests/dynamodb/tests/observability-metrics.rs

@@ -413,9 +413,11 @@ data class CargoDependency(
         fun smithyMocks(runtimeConfig: RuntimeConfig) =
             runtimeConfig.smithyRuntimeCrate("smithy-mocks", scope = DependencyScope.Dev)
 
-        fun smithyObservability(runtimeConfig: RuntimeConfig) = runtimeConfig.smithyRuntimeCrate("smithy-observability")
+        fun smithyObservability(runtimeConfig: RuntimeConfig) =
+            runtimeConfig.smithyRuntimeCrate("smithy-observability")
 
-        fun smithyObservabilityOtel(runtimeConfig: RuntimeConfig) = runtimeConfig.smithyRuntimeCrate("smithy-observability-otel")
+        fun smithyObservabilityOtel(runtimeConfig: RuntimeConfig) =
+            runtimeConfig.smithyRuntimeCrate("smithy-observability-otel")
 
         // behind feature-gate
         val Serde =

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/rustlang/CargoDependency.kt

@@ -12,8 +12,7 @@ rust-version = "1.88"
 
 [dependencies]
 aws-smithy-observability = { path = "../aws-smithy-observability" }
-opentelemetry = {version = "0.26.0", features = ["metrics"]}
-thiserror = "2.0"  # Required by opentelemetry 0.26.0 but not declared
+opentelemetry = {version = "0.24.0", features = ["metrics"]}
 # The following dependencies are transitive and pinned for build
 # compatability purposes
 value-bag = "1.10.0"
@@ -22,7 +21,7 @@ async-task = "=4.7.1"
 
 # This crate cannot be used on powerpc
 [target.'cfg(not(target_arch = "powerpc"))'.dependencies]
-opentelemetry_sdk = {version = "0.26.0", features = ["metrics", "testing"]}
+opentelemetry_sdk = {version = "0.24.0", features = ["metrics", "testing"]}
 
 [dev-dependencies]
 tokio = { version = "1.23.1" }