fix(telemetry): display custom event attributes properly on subscription events

.changesets/fix_bnjjj_fix_telemetry_on_event.md

@@ -0,0 +1,23 @@
+### Display custom event attributes properly on subscription events ([PR #6033](https://github.com/apollographql/router/pull/6033))
+
+Custom event attributes set using selectors at the supergraph level is now displayed properly. Example of configuration:
+
+```yaml title=router.yaml
+telemetry:
+  instrumentation:
+    events:
+      supergraph:
+        supergraph.event:
+          message: supergraph event
+          on: event_response # on every supergraph event (like subscription event for example)
+          level: info
+          attributes:
+            test:
+              static: foo
+            response.data:
+              response_data: $ # Display all the response data payload
+            response.errors:
+              response_errors: $ # Display all the response errors payload
+```
+
+By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/6033

.changesets/fix_latte_lens_tent_blaze.md

@@ -0,0 +1,6 @@
+### Don't send `apollo_private.*` attributes to  Jaeger collector ([PR #6033](https://github.com/apollographql/router/pull/6033))
+
+
+When using Jaeger collector to send traces you will no longer receive useless span attributes prefixed with `apollo_private.`
+
+By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/6033

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

@@ -9,6 +9,7 @@ use parking_lot::Mutex;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use tower::BoxError;
+use tracing::info_span;
 use tracing::Span;
 
 use super::instruments::Instrumented;
@@ -738,7 +739,10 @@ where
             let mut new_attributes = selectors.on_response_event(response, ctx);
             attributes.append(&mut new_attributes);
         }
-
+        // Dumb span to make sure the custom attributes are saved in current span extensions
+        // It won't be extracted or sampled at all
+        let span = info_span!("supergraph_event_send_event");
+        let _entered = span.enter();
         inner.send_event(attributes);
     }
 

apollo-router/src/plugins/telemetry/dynamic_attribute.rs

@@ -240,7 +240,9 @@ impl EventDynAttribute for ::tracing::Span {
         self.with_subscriber(move |(id, dispatch)| {
             if let Some(reg) = dispatch.downcast_ref::<Registry>() {
                 match reg.span(id) {
-                    None => eprintln!("no spanref, this is a bug"),
+                    None => {
+                        eprintln!("no spanref, this is a bug");
+                    }
                     Some(s) => {
                         if s.is_sampled() {
                             let mut extensions = s.extensions_mut();

apollo-router/src/plugins/telemetry/tracing/jaeger.rs

@@ -139,7 +139,8 @@ impl TracingConfigurator for Config {
                 Ok(builder.with_span_processor(
                     BatchSpanProcessor::builder(exporter, runtime::Tokio)
                         .with_batch_config(batch_processor.clone().into())
-                        .build(),
+                        .build()
+                        .filtered(),
                 ))
             }
             _ => Ok(builder),

apollo-router/tests/integration/telemetry/fixtures/json.router.yaml

@@ -68,6 +68,12 @@ telemetry:
             eq:
               - "log"
               - response_header: "x-log-request"
+        my.response_event.on_event:
+          message: "my response event message"
+          level: warn
+          on: event_response
+          attributes:
+            on_supergraph_response_event: on_supergraph_event
       subgraph:
         # Standard events
         request: info

apollo-router/tests/integration/telemetry/fixtures/json.sampler_off.router.yaml

@@ -51,6 +51,12 @@ telemetry:
             eq:
               - "log"
               - request_header: "x-log-request"
+        my.response_event.on_event:
+          message: "my response event message"
+          level: warn
+          on: event_response
+          attributes:
+            on_supergraph_response_event: on_supergraph_event
         my.request.event:
           message: "my event message"
           level: info

apollo-router/tests/integration/telemetry/fixtures/text.router.yaml

@@ -52,6 +52,12 @@ telemetry:
             eq:
               - "log"
               - request_header: "x-log-request"
+        my.response_event.on_event:
+          message: "my response event message"
+          level: warn
+          on: event_response
+          attributes:
+            on_supergraph_response_event: on_supergraph_event
         my.request.event:
           message: "my event message"
           level: info

apollo-router/tests/integration/telemetry/logging.rs

@@ -30,6 +30,10 @@ async fn test_json() -> Result<(), BoxError> {
     router.execute_query(&query).await;
     router.assert_log_contains(r#""static_one":"test""#).await;
     router.execute_query(&query).await;
+    router
+        .assert_log_contains(r#""on_supergraph_response_event":"on_supergraph_event""#)
+        .await;
+    router.execute_query(&query).await;
     router.assert_log_contains(r#""response_status":200"#).await;
     router.graceful_shutdown().await;
 
@@ -160,6 +164,10 @@ async fn test_json_sampler_off() -> Result<(), BoxError> {
     router.execute_query(&query).await;
     router.assert_log_contains(r#""static_one":"test""#).await;
     router.execute_query(&query).await;
+    router
+        .assert_log_contains(r#""on_supergraph_response_event":"on_supergraph_event""#)
+        .await;
+    router.execute_query(&query).await;
     router.assert_log_contains(r#""response_status":200"#).await;
     router.graceful_shutdown().await;
 
@@ -188,6 +196,10 @@ async fn test_text() -> Result<(), BoxError> {
     router.assert_log_contains("trace_id").await;
     router.execute_query(&query).await;
     router.assert_log_contains("span_id").await;
+    router
+        .assert_log_contains(r#"on_supergraph_response_event=on_supergraph_event"#)
+        .await;
+    router.execute_query(&query).await;
     router.execute_query(&query).await;
     router.assert_log_contains("response_status=200").await;
     router.graceful_shutdown().await;