Rename default server metrics (#4544)

## Motivation and Context
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here -->

## Description
<!--- Describe your changes in detail -->

## Testing
<!--- Please describe in detail how you tested your changes -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Checklist
<!--- If a checkbox below is not applicable, then please DELETE it
rather than leaving it unchecked -->
- [ ] For changes to the smithy-rs codegen or runtime crates, I have
created a changelog entry Markdown file in the `.changelog` directory,
specifying "client," "server," or both in the `applies_to` key.
- [ ] For changes to the AWS SDK, generated SDK code, or SDK runtime
crates, I have created a changelog entry Markdown file in the
`.changelog` directory, specifying "aws-sdk-rust" in the `applies_to`
key.

----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._

Author: jasgin

examples/pokemon-service/tests/snapshots/metrics_test__metrics_content_via_tcp.snap

@@ -2,6 +2,6 @@
 source: pokemon-service/tests/metrics_test.rs
 expression: metrics_output
 ---
-{"_aws":{"CloudWatchMetrics":[{"Namespace":"Ns","Dimensions":[[]],"Metrics":[{"Name":"found"},{"Name":"outstanding_requests"},{"Name":"http_status_code"},{"Name":"error"},{"Name":"fault"},{"Name":"operation_time","Unit":"Milliseconds"}]}],"Timestamp":"[timestamp]},"found":1,"outstanding_requests":1,"http_status_code":200,"error":0,"fault":0,"operation_time":"[operation_time],"test_request_metric":"test request metric","test_response_metric":"test response metric","requested_pokemon_name":"pikachu","service_name":"PokemonService","service_version":"2024-03-18","operation_name":"GetPokemonSpecies","request_id":"[request_id]}
-{"_aws":{"CloudWatchMetrics":[{"Namespace":"Ns","Dimensions":[[]],"Metrics":[{"Name":"authenticated"},{"Name":"outstanding_requests"},{"Name":"http_status_code"},{"Name":"error"},{"Name":"fault"},{"Name":"operation_time","Unit":"Milliseconds"}]}],"Timestamp":"[timestamp]},"authenticated":0,"outstanding_requests":1,"http_status_code":401,"error":1,"fault":0,"operation_time":"[operation_time],"test_request_metric":"test request metric","test_response_metric":"test response metric","user":"ash","service_name":"PokemonService","service_version":"2024-03-18","operation_name":"GetStorage","request_id":"[request_id]}
-{"_aws":{"CloudWatchMetrics":[{"Namespace":"Ns","Dimensions":[[]],"Metrics":[{"Name":"supported_region"},{"Name":"outstanding_requests"},{"Name":"http_status_code"},{"Name":"error"},{"Name":"fault"},{"Name":"operation_time","Unit":"Milliseconds"}]}],"Timestamp":"[timestamp]},"supported_region":0,"outstanding_requests":1,"http_status_code":500,"error":0,"fault":1,"operation_time":"[operation_time],"test_request_metric":"test request metric","test_response_metric":"test response metric","requested_region":"trigger500","service_name":"PokemonService","service_version":"2024-03-18","operation_name":"CapturePokemon","request_id":"[request_id]}
+{"_aws":{"CloudWatchMetrics":[{"Namespace":"Ns","Dimensions":[[]],"Metrics":[{"Name":"found"},{"Name":"outstanding_requests"},{"Name":"http_status_code"},{"Name":"error"},{"Name":"fault"},{"Name":"operation_time","Unit":"Milliseconds"}]}],"Timestamp":"[timestamp]},"found":1,"outstanding_requests":1,"http_status_code":200,"error":0,"fault":0,"operation_time":"[operation_time],"test_request_metric":"test request metric","test_response_metric":"test response metric","requested_pokemon_name":"pikachu","service":"PokemonService","service_version":"2024-03-18","operation":"GetPokemonSpecies","request_id":"[request_id]}
+{"_aws":{"CloudWatchMetrics":[{"Namespace":"Ns","Dimensions":[[]],"Metrics":[{"Name":"authenticated"},{"Name":"outstanding_requests"},{"Name":"http_status_code"},{"Name":"error"},{"Name":"fault"},{"Name":"operation_time","Unit":"Milliseconds"}]}],"Timestamp":"[timestamp]},"authenticated":0,"outstanding_requests":1,"http_status_code":401,"error":1,"fault":0,"operation_time":"[operation_time],"test_request_metric":"test request metric","test_response_metric":"test response metric","user":"ash","service":"PokemonService","service_version":"2024-03-18","operation":"GetStorage","request_id":"[request_id]}
+{"_aws":{"CloudWatchMetrics":[{"Namespace":"Ns","Dimensions":[[]],"Metrics":[{"Name":"supported_region"},{"Name":"outstanding_requests"},{"Name":"http_status_code"},{"Name":"error"},{"Name":"fault"},{"Name":"operation_time","Unit":"Milliseconds"}]}],"Timestamp":"[timestamp]},"supported_region":0,"outstanding_requests":1,"http_status_code":500,"error":0,"fault":1,"operation_time":"[operation_time],"test_request_metric":"test request metric","test_response_metric":"test response metric","requested_region":"trigger500","service":"PokemonService","service_version":"2024-03-18","operation":"CapturePokemon","request_id":"[request_id]}

rust-runtime/aws-smithy-http-server-metrics/src/default.rs

@@ -53,9 +53,9 @@ impl Debug for DefaultMetrics {
 #[metrics]
 #[derive(Debug, Default)]
 pub struct DefaultRequestMetrics {
-    pub(crate) service_name: Option<String>,
+    pub(crate) service: Option<String>,
     pub(crate) service_version: Option<String>,
-    pub(crate) operation_name: Option<String>,
+    pub(crate) operation: Option<String>,
     pub(crate) request_id: Option<String>,
     pub(crate) outstanding_requests: Option<usize>,
 }
@@ -82,8 +82,8 @@ pub struct DefaultResponseMetrics {
 pub struct DefaultRequestMetricsConfig {
     pub(crate) disable_all: bool,
     pub(crate) disable_request_id: bool,
-    pub(crate) disable_operation_name: bool,
-    pub(crate) disable_service_name: bool,
+    pub(crate) disable_operation: bool,
+    pub(crate) disable_service: bool,
     pub(crate) disable_service_version: bool,
     pub(crate) disable_outstanding_requests: bool,
 }

rust-runtime/aws-smithy-http-server-metrics/src/layer/builder.rs

@@ -51,14 +51,14 @@ macro_rules! impl_disable_methods {
         }
 
         /// Disable the `operation_name` metric
-        pub fn disable_default_operation_name_metric(mut self) -> Self {
-            self.default_req_metrics_config.disable_operation_name = true;
+        pub fn disable_default_operation_metric(mut self) -> Self {
+            self.default_req_metrics_config.disable_operation = true;
             self
         }
 
         /// Disable the `service_name` metric
-        pub fn disable_default_service_name_metric(mut self) -> Self {
-            self.default_req_metrics_config.disable_service_name = true;
+        pub fn disable_default_service_metric(mut self) -> Self {
+            self.default_req_metrics_config.disable_service = true;
             self
         }
 

rust-runtime/aws-smithy-http-server-metrics/src/lib.rs

@@ -48,9 +48,9 @@
 //!         vec![
 //!             vec![],
 //!             vec![
-//!                 "service_name".to_string(),
+//!                 "service".to_string(),
 //!                 "service_version".to_string(),
-//!                 "operation_name".to_string(),
+//!                 "operation".to_string(),
 //!             ],
 //!         ],
 //!     )
@@ -162,9 +162,9 @@
 //!
 //! | Metric | Description |
 //! |--------|-------------|
-//! | `service_name` | Name of the service |
+//! | `service` | Name of the service |
 //! | `service_version` | Version of the service |
-//! | `operation_name` | Name of the operation being invoked |
+//! | `operation` | Name of the operation being invoked |
 //! | `request_id` | Unique identifier for the request |
 //! | `outstanding_requests` | Number of concurrent requests counting any operation being processing in that moment |
 //!

rust-runtime/aws-smithy-http-server-metrics/src/plugin.rs

@@ -169,9 +169,9 @@ where
     fn apply(&self, inner: T) -> Self::Output {
         DefaultMetricsPluginService {
             inner,
-            service_name: Ser::ID.name(),
+            service: Ser::ID.name(),
             service_version: Ser::VERSION,
-            operation_name: Op::ID.name(),
+            operation: Op::ID.name(),
         }
     }
 }
@@ -184,9 +184,9 @@ where
 #[derive(Debug)]
 pub struct DefaultMetricsPluginService<Ser> {
     inner: Ser,
-    service_name: &'static str,
+    service: &'static str,
     service_version: Option<&'static str>,
-    operation_name: &'static str,
+    operation: &'static str,
 }
 
 impl<Ser> Clone for DefaultMetricsPluginService<Ser>
@@ -196,8 +196,8 @@ where
     fn clone(&self) -> Self {
         Self {
             inner: self.inner.clone(),
-            operation_name: self.operation_name,
-            service_name: self.service_name,
+            operation: self.operation,
+            service: self.service,
             service_version: self.service_version,
         }
     }
@@ -212,9 +212,9 @@ where
     /// Assigns None to those that need information from the outer metrics layer to be set
     fn get_default_request_metrics(&self, req: &HttpRequest) -> DefaultRequestMetrics {
         DefaultRequestMetrics {
-            service_name: Some(self.service_name.to_string()),
+            service: Some(self.service.to_string()),
             service_version: self.service_version.map(|n| n.to_string()),
-            operation_name: Some(self.operation_name.to_string()),
+            operation: Some(self.operation.to_string()),
             request_id: req
                 .extensions()
                 .get::<ServerRequestId>()
@@ -343,15 +343,11 @@ fn extend_default_request_metrics(
     );
 
     DefaultRequestMetrics {
-        service_name: metrics
-            .service_name
-            .filter(|_| !config.disable_service_name),
+        service: metrics.service.filter(|_| !config.disable_service),
         service_version: metrics
             .service_version
             .filter(|_| !config.disable_service_version),
-        operation_name: metrics
-            .operation_name
-            .filter(|_| !config.disable_operation_name),
+        operation: metrics.operation.filter(|_| !config.disable_operation),
         request_id: metrics.request_id.filter(|_| !config.disable_request_id),
         outstanding_requests,
     }