Add feature ID for S3 Transfer Manager

aws/rust-runtime/aws-runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aws-runtime"
-version = "1.4.3"
+version = "1.4.4"
 authors = ["AWS Rust SDK Team <aws-sdk-rust@amazon.com>"]
 description = "Runtime support code for the AWS SDK. This crate isn't intended to be used directly."
 edition = "2021"

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

@@ -38,6 +38,10 @@ pub mod invocation_id;
 /// Supporting code for request metadata headers in the AWS SDK.
 pub mod request_info;
 
+/// AWS SDK feature identifies.
+#[doc(hidden)]
+pub mod sdk_feature;
+
 /// Interceptor that determines the clock skew between the client and service.
 pub mod service_clock_skew;
 

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

@@ -0,0 +1,18 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+use aws_smithy_types::config_bag::{Storable, StoreAppend};
+
+/// IDs for the features that may be used in the AWS SDK
+#[non_exhaustive]
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum AwsSdkFeature {
+    /// Indicates that an operation was called by the S3 Transfer Manager
+    S3Transfer,
+}
+
+impl Storable for AwsSdkFeature {
+    type Storer = StoreAppend<Self>;
+}

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

@@ -20,6 +20,7 @@ use aws_smithy_types::config_bag::ConfigBag;
 use aws_types::app_name::AppName;
 use aws_types::os_shim_internal::Env;
 
+use crate::sdk_feature::AwsSdkFeature;
 use crate::user_agent::metrics::ProvideBusinessMetric;
 use crate::user_agent::{AdditionalMetadata, ApiMetadata, AwsUserAgent, InvalidMetadataValue};
 
@@ -138,6 +139,13 @@ impl Intercept for UserAgentInterceptor {
                 .map(|m| ua.add_business_metric(m));
         }
 
+        let aws_sdk_features = cfg.load::<AwsSdkFeature>();
+        for aws_sdk_feature in aws_sdk_features {
+            aws_sdk_feature
+                .provide_business_metric()
+                .map(|m| ua.add_business_metric(m));
+        }
+
         let maybe_connector_metadata = runtime_components
             .http_client()
             .and_then(|c| c.connector_metadata());

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

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+use crate::sdk_feature::AwsSdkFeature;
 use aws_smithy_runtime::client::sdk_feature::SmithySdkFeature;
 use once_cell::sync::Lazy;
 use std::borrow::Cow;
@@ -155,6 +156,15 @@ impl ProvideBusinessMetric for SmithySdkFeature {
     }
 }
 
+impl ProvideBusinessMetric for AwsSdkFeature {
+    fn provide_business_metric(&self) -> Option<BusinessMetric> {
+        use AwsSdkFeature::*;
+        match self {
+            S3Transfer => Some(BusinessMetric::S3Transfer),
+        }
+    }
+}
+
 #[derive(Clone, Debug, Default)]
 pub(super) struct BusinessMetrics(Vec<BusinessMetric>);
 

aws/sdk/integration-tests/s3/tests/business_metrics.rs

@@ -0,0 +1,63 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+use aws_config::Region;
+use aws_runtime::{
+    sdk_feature::AwsSdkFeature, user_agent::test_util::assert_ua_contains_metric_values,
+};
+use aws_sdk_s3::{
+    config::{Intercept, IntoShared},
+    primitives::ByteStream,
+    Client, Config,
+};
+use aws_smithy_runtime::client::http::test_util::capture_request;
+
+#[derive(Debug)]
+struct TransferManagerFeatureInterceptor;
+
+impl Intercept for TransferManagerFeatureInterceptor {
+    fn name(&self) -> &'static str {
+        "TransferManagerFeature"
+    }
+
+    fn read_before_execution(
+        &self,
+        _ctx: &aws_sdk_s3::config::interceptors::BeforeSerializationInterceptorContextRef<'_>,
+        cfg: &mut aws_sdk_s3::config::ConfigBag,
+    ) -> Result<(), aws_sdk_s3::error::BoxError> {
+        cfg.interceptor_state()
+            .store_append(AwsSdkFeature::S3Transfer);
+        Ok(())
+    }
+}
+
+#[tokio::test]
+async fn test_track_metric_for_s3_transfer_manager() {
+    let (http_client, captured_request) = capture_request(None);
+    let mut conf_builder = Config::builder()
+        .region(Region::new("us-east-1"))
+        .http_client(http_client.clone())
+        .with_test_defaults();
+    // The S3 Transfer Manager uses a passed-in S3 client SDK for operations.
+    // By configuring an interceptor at the client level to track metrics,
+    // all operations executed by the client will automatically include the metric.
+    // This eliminates the need to apply `.config_override` on individual operations
+    // to insert the `TransferManagerFeatureInterceptor`.
+    conf_builder.push_interceptor(TransferManagerFeatureInterceptor.into_shared());
+    let client = Client::from_conf(conf_builder.build());
+
+    let _ = client
+        .put_object()
+        .bucket("doesnotmatter")
+        .key("doesnotmatter")
+        .body(ByteStream::from_static("Hello, world".as_bytes()))
+        .send()
+        .await
+        .unwrap();
+
+    let expected_req = captured_request.expect_request();
+    let user_agent = expected_req.headers().get("x-amz-user-agent").unwrap();
+    assert_ua_contains_metric_values(user_agent, &["G"]);
+}

rust-runtime/aws-smithy-runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aws-smithy-runtime"
-version = "1.7.3"
+version = "1.7.4"
 authors = ["AWS Rust SDK Team <aws-sdk-rust@amazon.com>", "Zelda Hessler <zhessler@amazon.com>"]
 description = "The new smithy runtime crate"
 edition = "2021"

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

@@ -47,7 +47,9 @@ pub mod interceptors;
 /// Stalled stream protection for clients
 pub mod stalled_stream_protection;
 
+/// Generic Smithy SDK feature identifies.
 #[doc(hidden)]
 pub mod sdk_feature;
+
 /// Smithy support-code for code generated waiters.
 pub mod waiters;