Fix formatting, bump codegen version to 0.1.7, and add observability dependencies

Author: vcjana

aws/codegen-aws-sdk/src/main/kotlin/software/amazon/smithy/rustsdk/ObservabilityMetricDecorator.kt

@@ -9,6 +9,7 @@ import software.amazon.smithy.rust.codegen.client.smithy.ClientCodegenContext
 import software.amazon.smithy.rust.codegen.client.smithy.customize.ClientCodegenDecorator
 import software.amazon.smithy.rust.codegen.client.smithy.generators.ServiceRuntimePluginCustomization
 import software.amazon.smithy.rust.codegen.client.smithy.generators.ServiceRuntimePluginSection
+import software.amazon.smithy.rust.codegen.core.rustlang.CargoDependency
 import software.amazon.smithy.rust.codegen.core.rustlang.rustTemplate
 import software.amazon.smithy.rust.codegen.core.rustlang.writable
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType
@@ -27,18 +28,21 @@ class ObservabilityMetricDecorator : ClientCodegenDecorator {
         baseCustomizations + listOf(ObservabilityFeatureTrackerInterceptor(codegenContext))
 }
 
-private class ObservabilityFeatureTrackerInterceptor(codegenContext: ClientCodegenContext) :
+private class ObservabilityFeatureTrackerInterceptor(private val codegenContext: ClientCodegenContext) :
     ServiceRuntimePluginCustomization() {
     override fun section(section: ServiceRuntimePluginSection) =
         writable {
             if (section is ServiceRuntimePluginSection.RegisterRuntimeComponents) {
                 section.registerInterceptor(this) {
+                    val runtimeConfig = codegenContext.runtimeConfig
                     rustTemplate(
                         "#{Interceptor}",
                         "Interceptor" to
                             RuntimeType.forInlineDependency(
                                 InlineAwsDependency.forRustFile(
                                     "observability_feature",
+                                    CargoDependency.smithyObservability(runtimeConfig),
+                                    CargoDependency.smithyObservabilityOtel(runtimeConfig),
                                 ),
                             ).resolve("ObservabilityFeatureTrackerInterceptor"),
                     )

aws/rust-runtime/aws-inlineable/src/observability_feature.rs

@@ -25,16 +25,15 @@ impl Intercept for ObservabilityFeatureTrackerInterceptor {
         cfg: &mut ConfigBag,
     ) -> Result<(), BoxError> {
         // Check if an OpenTelemetry meter provider is configured via the global provider
-        if let Ok(telemetry_provider) = aws_smithy_observability::global::get_telemetry_provider()
-        {
+        if let Ok(telemetry_provider) = aws_smithy_observability::global::get_telemetry_provider() {
             let meter_provider = telemetry_provider.meter_provider();
-            
+
             // Use downcast to check if it's specifically the OTel implementation
             // This is more reliable than string matching on type names
             if let Some(_otel_provider) = meter_provider
                 .as_any()
-                .downcast_ref::<aws_smithy_observability_otel::meter::OtelMeterProvider>()
-            {
+                .downcast_ref::<aws_smithy_observability_otel::meter::OtelMeterProvider>(
+            ) {
                 cfg.interceptor_state()
                     .store_append(AwsSdkFeature::ObservabilityOtelMetrics);
             }

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

@@ -13,7 +13,9 @@ use aws_smithy_types::body::SdkBody;
 use http::header::USER_AGENT;
 use std::sync::Arc;
 
-fn test_client(update_builder: fn(Builder) -> Builder) -> (aws_sdk_dynamodb::Client, StaticReplayClient) {
+fn test_client(
+    update_builder: fn(Builder) -> Builder,
+) -> (aws_sdk_dynamodb::Client, StaticReplayClient) {
     let http_client = StaticReplayClient::new(vec![ReplayEvent::new(
         http::Request::builder()
             .uri("https://dynamodb.us-east-1.amazonaws.com/")
@@ -48,7 +50,7 @@ async fn observability_metrics_in_user_agent() {
         call_operation(client).await;
         let req = rx.expect_request();
         let user_agent = req.headers().get("x-amz-user-agent").unwrap();
-        
+
         // Should NOT contain observability metrics when using noop provider
         let ua_str = user_agent.to_str().unwrap();
         assert!(!ua_str.contains("m/4")); // OBSERVABILITY_TRACING = "4"

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

@@ -413,6 +413,10 @@ data class CargoDependency(
         fun smithyMocks(runtimeConfig: RuntimeConfig) =
             runtimeConfig.smithyRuntimeCrate("smithy-mocks", scope = DependencyScope.Dev)
 
+        fun smithyObservability(runtimeConfig: RuntimeConfig) = runtimeConfig.smithyRuntimeCrate("smithy-observability")
+
+        fun smithyObservabilityOtel(runtimeConfig: RuntimeConfig) = runtimeConfig.smithyRuntimeCrate("smithy-observability-otel")
+
         // behind feature-gate
         val Serde =
             CargoDependency("serde", CratesIo("1.0"), features = setOf("derive"), scope = DependencyScope.CfgUnstable)

gradle.properties

@@ -17,4 +17,4 @@ allowLocalDeps=false
 # Avoid registering dependencies/plugins/tasks that are only used for testing purposes
 isTestingEnabled=true
 # codegen publication version
-codegenVersion=0.1.6
+codegenVersion=0.1.7

rust-runtime/aws-smithy-observability-otel/src/meter.rs

@@ -286,7 +286,7 @@ impl ProvideMeter for OtelMeterProvider {
     fn get_meter(&self, scope: &'static str, _attributes: Option<&Attributes>) -> Meter {
         Meter::new(Arc::new(MeterWrap(self.meter_provider.meter(scope))))
     }
-    
+
     fn as_any(&self) -> &dyn std::any::Any {
         self
     }

rust-runtime/aws-smithy-observability/src/meter.rs

@@ -17,7 +17,7 @@ use std::{borrow::Cow, fmt::Debug, sync::Arc};
 pub trait ProvideMeter: Send + Sync + Debug {
     /// Get or create a named [Meter].
     fn get_meter(&self, scope: &'static str, attributes: Option<&Attributes>) -> Meter;
-    
+
     /// Returns a reference to `self` as `&dyn Any` for downcasting.
     fn as_any(&self) -> &dyn std::any::Any;
 }

rust-runtime/aws-smithy-observability/src/noop.rs

@@ -24,7 +24,7 @@ impl ProvideMeter for NoopMeterProvider {
     fn get_meter(&self, _scope: &'static str, _attributes: Option<&Attributes>) -> Meter {
         Meter::new(Arc::new(NoopMeter))
     }
-    
+
     fn as_any(&self) -> &dyn std::any::Any {
         self
     }