Move ObservabilityOtelMetrics to SmithySdkFeature and add default as_any() implementation

Author: vcjana

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

@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-use aws_runtime::sdk_feature::AwsSdkFeature;
+use aws_smithy_runtime::client::sdk_feature::SmithySdkFeature;
 use aws_smithy_runtime_api::{
     box_error::BoxError,
     client::interceptors::{context::BeforeSerializationInterceptorContextRef, Intercept},
 };
 use aws_smithy_types::config_bag::ConfigBag;
 
-// Interceptor that tracks AWS SDK features for observability (tracing/metrics).
+// Interceptor that tracks Smithy SDK features for observability (tracing/metrics).
 #[derive(Debug, Default)]
 pub(crate) struct ObservabilityFeatureTrackerInterceptor;
 
@@ -35,7 +35,7 @@ impl Intercept for ObservabilityFeatureTrackerInterceptor {
                 .downcast_ref::<aws_smithy_observability_otel::meter::OtelMeterProvider>(
             ) {
                 cfg.interceptor_state()
-                    .store_append(AwsSdkFeature::ObservabilityOtelMetrics);
+                    .store_append(SmithySdkFeature::ObservabilityOtelMetrics);
             }
         }
 

aws/rust-runtime/aws-runtime/src/sdk_feature.rs

@@ -24,8 +24,6 @@ pub enum AwsSdkFeature {
     SsoLoginDevice,
     /// Calling an SSO-OIDC operation as part of the SSO login flow, when using the OAuth2.0 authorization code grant
     SsoLoginAuth,
-    /// Indicates that an AWS SDK client has been configured with an OpenTelemetry metrics provider
-    ObservabilityOtelMetrics,
 }
 
 impl Storable for AwsSdkFeature {

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

@@ -210,6 +210,7 @@ impl ProvideBusinessMetric for SmithySdkFeature {
             FlexibleChecksumsResWhenRequired => {
                 Some(BusinessMetric::FlexibleChecksumsResWhenRequired)
             }
+            ObservabilityOtelMetrics => Some(BusinessMetric::ObservabilityOtelMetrics),
             otherwise => {
                 // This may occur if a customer upgrades only the `aws-smithy-runtime-api` crate
                 // while continuing to use an outdated version of an SDK crate or the `aws-runtime`
@@ -234,7 +235,6 @@ impl ProvideBusinessMetric for AwsSdkFeature {
             S3Transfer => Some(BusinessMetric::S3Transfer),
             SsoLoginDevice => Some(BusinessMetric::SsoLoginDevice),
             SsoLoginAuth => Some(BusinessMetric::SsoLoginAuth),
-            ObservabilityOtelMetrics => Some(BusinessMetric::ObservabilityOtelMetrics),
         }
     }
 }

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

@@ -286,10 +286,6 @@ 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
-    }
 }
 
 #[cfg(test)]

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

@@ -19,7 +19,9 @@ pub trait ProvideMeter: Send + Sync + Debug {
     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;
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
 }
 
 /// The entry point to creating instruments. A grouping of related metrics.

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

@@ -24,10 +24,6 @@ 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
-    }
 }
 
 #[derive(Debug)]

rust-runtime/aws-smithy-runtime/src/client/sdk_feature.rs

@@ -23,6 +23,8 @@ pub enum SmithySdkFeature {
     FlexibleChecksumsReqWhenRequired,
     FlexibleChecksumsResWhenSupported,
     FlexibleChecksumsResWhenRequired,
+    /// Indicates that a Smithy SDK client has been configured with an OpenTelemetry metrics provider
+    ObservabilityOtelMetrics,
 }
 
 impl Storable for SmithySdkFeature {