Add ability to alias standard attributes for telemetry

apollo-router/src/plugins/telemetry/config_new/cache/attributes.rs

@@ -3,6 +3,7 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use tower::BoxError;
 
+use crate::plugins::telemetry::config_new::attributes::StandardAttribute;
 use crate::plugins::telemetry::config_new::DefaultAttributeRequirementLevel;
 use crate::plugins::telemetry::config_new::DefaultForLevel;
 use crate::plugins::telemetry::config_new::Selectors;
@@ -15,7 +16,7 @@ use crate::Context;
 pub(crate) struct CacheAttributes {
     /// Entity type
     #[serde(rename = "entity.type")]
-    pub(crate) entity_type: Option<bool>,
+    pub(crate) entity_type: Option<StandardAttribute>,
 }
 
 impl DefaultForLevel for CacheAttributes {
@@ -26,7 +27,8 @@ impl DefaultForLevel for CacheAttributes {
     ) {
         if let TelemetryDataKind::Metrics = kind {
             if let DefaultAttributeRequirementLevel::Required = requirement_level {
-                self.entity_type.get_or_insert(false);
+                self.entity_type
+                    .get_or_insert(StandardAttribute::Bool(false));
             }
         }
     }

apollo-router/src/plugins/telemetry/config_new/cache/mod.rs

@@ -93,14 +93,14 @@ impl Instrumented for CacheInstruments {
                         inner_cache_hit.selector = Some(Arc::new(SubgraphSelector::StaticField {
                             r#static: AttributeValue::I64(*hit as i64),
                         }));
-                        if inner_cache_hit
+                        if let Some(key) = inner_cache_hit
                             .selectors
                             .as_ref()
-                            .map(|s| s.attributes.entity_type == Some(true))
-                            .unwrap_or_default()
+                            .and_then(|s| s.attributes.entity_type.as_ref())
+                            .and_then(|a| a.key(ENTITY_TYPE))
                         {
                             inner_cache_hit.attributes.push(KeyValue::new(
-                                ENTITY_TYPE,
+                                key,
                                 opentelemetry::Value::String(entity_type.to_string().into()),
                             ));
                         }
@@ -118,14 +118,14 @@ impl Instrumented for CacheInstruments {
                         inner_cache_miss.selector = Some(Arc::new(SubgraphSelector::StaticField {
                             r#static: AttributeValue::I64(*miss as i64),
                         }));
-                        if inner_cache_miss
+                        if let Some(key) = inner_cache_miss
                             .selectors
                             .as_ref()
-                            .map(|s| s.attributes.entity_type == Some(true))
-                            .unwrap_or_default()
+                            .and_then(|s| s.attributes.entity_type.as_ref())
+                            .and_then(|a| a.key(ENTITY_TYPE))
                         {
                             inner_cache_miss.attributes.push(KeyValue::new(
-                                ENTITY_TYPE,
+                                key,
                                 opentelemetry::Value::String(entity_type.to_string().into()),
                             ));
                         }

apollo-router/src/plugins/telemetry/config_new/cost/mod.rs

@@ -9,6 +9,7 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use tower::BoxError;
 
+use super::attributes::StandardAttribute;
 use super::instruments::Increment;
 use super::instruments::StaticInstrument;
 use crate::metrics;
@@ -47,16 +48,16 @@ static COST_DELTA: &str = "cost.delta";
 pub(crate) struct SupergraphCostAttributes {
     /// The estimated cost of the operation using the currently configured cost model
     #[serde(rename = "cost.estimated")]
-    cost_estimated: Option<bool>,
+    cost_estimated: Option<StandardAttribute>,
     /// The actual cost of the operation using the currently configured cost model
     #[serde(rename = "cost.actual")]
-    cost_actual: Option<bool>,
+    cost_actual: Option<StandardAttribute>,
     /// The delta (estimated - actual) cost of the operation using the currently configured cost model
     #[serde(rename = "cost.delta")]
-    cost_delta: Option<bool>,
+    cost_delta: Option<StandardAttribute>,
     /// The cost result, this is an error code returned by the cost calculation or COST_OK
     #[serde(rename = "cost.result")]
-    cost_result: Option<bool>,
+    cost_result: Option<StandardAttribute>,
 }
 
 impl Selectors for SupergraphCostAttributes {
@@ -82,17 +83,33 @@ impl Selectors for SupergraphCostAttributes {
             .extensions()
             .with_lock(|lock| lock.get::<CostContext>().cloned());
         if let Some(cost_result) = cost_result {
-            if let Some(true) = self.cost_estimated {
-                attrs.push(KeyValue::new("cost.estimated", cost_result.estimated));
+            if let Some(key) = self
+                .cost_estimated
+                .as_ref()
+                .and_then(|a| a.key(Key::from_static_str("cost.estimated")))
+            {
+                attrs.push(KeyValue::new(key, cost_result.estimated));
             }
-            if let Some(true) = self.cost_actual {
-                attrs.push(KeyValue::new("cost.actual", cost_result.actual));
+            if let Some(key) = self
+                .cost_actual
+                .as_ref()
+                .and_then(|a| a.key(Key::from_static_str("cost.actual")))
+            {
+                attrs.push(KeyValue::new(key, cost_result.actual));
             }
-            if let Some(true) = self.cost_delta {
-                attrs.push(KeyValue::new("cost.delta", cost_result.delta()));
+            if let Some(key) = self
+                .cost_delta
+                .as_ref()
+                .and_then(|a| a.key(Key::from_static_str("cost.delta")))
+            {
+                attrs.push(KeyValue::new(key, cost_result.delta()));
             }
-            if let Some(true) = self.cost_result {
-                attrs.push(KeyValue::new("cost.result", cost_result.result));
+            if let Some(key) = self
+                .cost_result
+                .as_ref()
+                .and_then(|a| a.key(Key::from_static_str("cost.result")))
+            {
+                attrs.push(KeyValue::new(key, cost_result.result));
             }
         }
         attrs

apollo-router/src/plugins/telemetry/config_new/extendable.rs

@@ -283,6 +283,7 @@ mod test {
     use crate::plugins::telemetry::config_new::attributes::HttpCommonAttributes;
     use crate::plugins::telemetry::config_new::attributes::HttpServerAttributes;
     use crate::plugins::telemetry::config_new::attributes::RouterAttributes;
+    use crate::plugins::telemetry::config_new::attributes::StandardAttribute;
     use crate::plugins::telemetry::config_new::attributes::SupergraphAttributes;
     use crate::plugins::telemetry::config_new::conditional::Conditional;
     use crate::plugins::telemetry::config_new::conditions::Condition;
@@ -312,8 +313,8 @@ mod test {
             extendable_conf.attributes,
             SupergraphAttributes {
                 graphql_document: None,
-                graphql_operation_name: Some(true),
-                graphql_operation_type: Some(true),
+                graphql_operation_name: Some(StandardAttribute::Bool(true)),
+                graphql_operation_type: Some(StandardAttribute::Bool(true)),
                 cost: Default::default()
             }
         );
@@ -384,12 +385,12 @@ mod test {
                 trace_id: None,
                 baggage: None,
                 common: HttpCommonAttributes {
-                    http_request_method: Some(true),
-                    http_response_status_code: Some(true),
+                    http_request_method: Some(StandardAttribute::Bool(true)),
+                    http_response_status_code: Some(StandardAttribute::Bool(true)),
                     ..Default::default()
                 },
                 server: HttpServerAttributes {
-                    url_path: Some(true),
+                    url_path: Some(StandardAttribute::Bool(true)),
                     ..Default::default()
                 }
             }

apollo-router/src/plugins/telemetry/config_new/fixtures/router/http.server.request.duration_with_custom_attributes/metrics.snap

@@ -10,6 +10,8 @@ info:
           http.server.active_requests: false
           http.server.request.duration:
             attributes:
+              http.request.method:
+                alias: http_method
               my_attribute:
                 request_method: true
               graphql.operation.name:
@@ -23,6 +25,6 @@ info:
       - sum: 0.1
         attributes:
           graphql.operation.name: TestQuery
-          http.request.method: GET
           http.response.status_code: 200
+          http_method: GET
           my_attribute: GET

apollo-router/src/plugins/telemetry/config_new/fixtures/router/http.server.request.duration_with_custom_attributes/router.yaml

@@ -5,6 +5,8 @@ telemetry:
         http.server.active_requests: false
         http.server.request.duration:
           attributes:
+            http.request.method:
+              alias: http_method
             my_attribute:
               request_method: true
             graphql.operation.name:

apollo-router/src/plugins/telemetry/config_new/fixtures/subgraph/caching/metrics.snap

@@ -10,7 +10,8 @@ info:
         cache:
           apollo.router.operations.entity.cache:
             attributes:
-              entity.type: true
+              entity.type:
+                alias: entity_type
               subgraph.name:
                 subgraph_name: true
               supergraph.operation.name:
@@ -63,25 +64,25 @@ info:
       - value: 0
         attributes:
           cache.hit: false
-          entity.type: Product
+          entity_type: Product
           subgraph.name: products
           supergraph.operation.name: Test
       - value: 0
         attributes:
           cache.hit: false
-          entity.type: Review
+          entity_type: Review
           subgraph.name: products
           supergraph.operation.name: Test
       - value: 3
         attributes:
           cache.hit: true
-          entity.type: Product
+          entity_type: Product
           subgraph.name: products
           supergraph.operation.name: Test
       - value: 5
         attributes:
           cache.hit: true
-          entity.type: Review
+          entity_type: Review
           subgraph.name: products
           supergraph.operation.name: Test
 - name: only_cache_hit_on_subgraph_products

apollo-router/src/plugins/telemetry/config_new/fixtures/subgraph/caching/router.yaml

@@ -5,7 +5,8 @@ telemetry:
       cache:
         apollo.router.operations.entity.cache:
           attributes:
-            entity.type: true
+            entity.type:
+              alias: entity_type
             subgraph.name:
               subgraph_name: true
             supergraph.operation.name:

apollo-router/src/plugins/telemetry/config_new/fixtures/subgraph/http_client_request_duration/metrics.snap

@@ -0,0 +1,23 @@
+---
+source: apollo-router/src/plugins/telemetry/config_new/instruments.rs
+description: standard instrument http.client.request.duration
+expression: "&metrics.all()"
+info:
+  telemetry:
+    instrumentation:
+      instruments:
+        default_requirement_level: none
+        subgraph:
+          http.client.request.duration:
+            attributes:
+              subgraph.name:
+                alias: apollo_subgraph_name
+---
+- name: http.client.request.duration
+  description: Duration of HTTP client requests.
+  unit: s
+  data:
+    datapoints:
+      - sum: 0.1
+        attributes:
+          apollo_subgraph_name: products

apollo-router/src/plugins/telemetry/config_new/fixtures/subgraph/http_client_request_duration/router.yaml

@@ -0,0 +1,9 @@
+telemetry:
+  instrumentation:
+    instruments:
+      default_requirement_level: none
+      subgraph:
+        http.client.request.duration:
+          attributes:
+            subgraph.name:
+              alias: apollo_subgraph_name

apollo-router/src/plugins/telemetry/config_new/fixtures/subgraph/http_client_request_duration/test.yaml

@@ -0,0 +1,30 @@
+description: standard instrument http.client.request.duration
+events:
+  - - router_request:
+        uri: "/hello"
+        method: GET
+        body: |
+          hello
+    - supergraph_request:
+        uri: "/hello"
+        method: GET
+        headers:
+          custom_header: custom_value
+        query: "query { hello }"
+    - subgraph_request:
+        query: "query { hello }"
+        operation_name: "Products"
+        operation_kind: query
+        subgraph_name: "products"
+    - subgraph_response:
+        status: 200
+        data:
+          hello: "world"
+    - supergraph_response:
+        status: 200
+        data:
+          hello: "world"
+    - router_response:
+        body: |
+          hello
+        status: 200