Migrate monotonic counter metrics to u64_counter!

apollo-router/src/cache/storage.rs

@@ -170,10 +170,12 @@ where
 
         match res {
             Some(v) => {
-                tracing::info!(
-                    monotonic_counter.apollo_router_cache_hit_count = 1u64,
-                    kind = %self.caller,
-                    storage = &tracing::field::display(CacheStorageName::Memory),
+                u64_counter!(
+                    "apollo_router_cache_hit_count",
+                    "Number of cache hits",
+                    1,
+                    kind = self.caller,
+                    storage = CacheStorageName::Memory.to_string()
                 );
                 let duration = instant_memory.elapsed().as_secs_f64();
                 tracing::info!(
@@ -190,10 +192,12 @@ where
                     kind = %self.caller,
                     storage = &tracing::field::display(CacheStorageName::Memory),
                 );
-                tracing::info!(
-                    monotonic_counter.apollo_router_cache_miss_count = 1u64,
-                    kind = %self.caller,
-                    storage = &tracing::field::display(CacheStorageName::Memory),
+                u64_counter!(
+                    "apollo_router_cache_miss_count",
+                    "Number of cache misses",
+                    1,
+                    kind = self.caller,
+                    storage = CacheStorageName::Memory.to_string()
                 );
 
                 let instant_redis = Instant::now();
@@ -214,10 +218,12 @@ where
                         Some(v) => {
                             self.insert_in_memory(key.clone(), v.0.clone()).await;
 
-                            tracing::info!(
-                                monotonic_counter.apollo_router_cache_hit_count = 1u64,
-                                kind = %self.caller,
-                                storage = &tracing::field::display(CacheStorageName::Redis),
+                            u64_counter!(
+                                "apollo_router_cache_hit_count",
+                                "Number of cache hits",
+                                1,
+                                kind = self.caller,
+                                storage = CacheStorageName::Redis.to_string()
                             );
                             let duration = instant_redis.elapsed().as_secs_f64();
                             tracing::info!(
@@ -228,10 +234,12 @@ where
                             Some(v.0)
                         }
                         None => {
-                            tracing::info!(
-                                monotonic_counter.apollo_router_cache_miss_count = 1u64,
-                                kind = %self.caller,
-                                storage = &tracing::field::display(CacheStorageName::Redis),
+                            u64_counter!(
+                                "apollo_router_cache_miss_count",
+                                "Number of cache misses",
+                                1,
+                                kind = self.caller,
+                                storage = CacheStorageName::Redis.to_string()
                             );
                             let duration = instant_redis.elapsed().as_secs_f64();
                             tracing::info!(

apollo-router/src/graphql/request.rs

@@ -202,9 +202,11 @@ impl Request {
                 mode = %BatchingMode::BatchHttpLink // Only supported mode right now
             );
 
-            tracing::info!(
-                monotonic_counter.apollo.router.operations.batching = 1u64,
-                mode = %BatchingMode::BatchHttpLink // Only supported mode right now
+            u64_counter!(
+                "apollo.router.operations.batching",
+                "Total requests with batched operations",
+                1,
+                mode = BatchingMode::BatchHttpLink.to_string() // Only supported mode right now
             );
             for entry in value
                 .as_array()
@@ -229,9 +231,11 @@ impl Request {
                 mode = "batch_http_link" // Only supported mode right now
             );
 
-            tracing::info!(
-                monotonic_counter.apollo.router.operations.batching = 1u64,
-                mode = "batch_http_link" // Only supported mode right now
+            u64_counter!(
+                "apollo.router.operations.batching",
+                "Total requests with batched operations",
+                1,
+                mode = BatchingMode::BatchHttpLink.to_string() // Only supported mode right now
             );
             for entry in value
                 .as_array()

apollo-router/src/metrics/mod.rs

@@ -496,7 +496,9 @@ pub(crate) fn meter_provider() -> AggregateMeterProvider {
 }
 
 #[macro_export]
-/// Get or create a u64 monotonic counter metric and add a value to it
+/// Get or create a `u64` monotonic counter metric and add a value to it.
+///
+/// Each metric needs a description.
 ///
 /// This macro is a replacement for the telemetry crate's MetricsLayer. We will eventually convert all metrics to use these macros and deprecate the MetricsLayer.
 /// The reason for this is that the MetricsLayer has:
@@ -506,6 +508,33 @@ pub(crate) fn meter_provider() -> AggregateMeterProvider {
 /// * Imperfect mapping to metrics API that can only be checked at runtime.
 ///
 /// New metrics should be added using these macros.
+///
+/// # Examples
+/// ```ignore
+/// // Count a thing:
+/// u64_counter!(
+///     "apollo.router.operations.frobbles",
+///     "The amount of frobbles we've operated on",
+///     1
+/// );
+/// // Count a thing with attributes:
+/// u64_counter!(
+///     "apollo.router.operations.frobbles",
+///     "The amount of frobbles we've operated on",
+///     1,
+///     frobbles.color = "blue"
+/// );
+/// // Count a thing with dynamic attributes:
+/// let attributes = [
+///     opentelemetry::KeyValue::new("frobbles.color".to_string(), "blue".into()),
+/// ];
+/// u64_counter!(
+///     "apollo.router.operations.frobbles",
+///     "The amount of frobbles we've operated on",
+///     1,
+///     attributes
+/// );
+/// ```
 #[allow(unused_macros)]
 macro_rules! u64_counter {
     ($($name:ident).+, $description:literal, $value: expr, $($attr_key:literal = $attr_value:expr),+) => {

apollo-router/src/notification.rs

@@ -510,7 +510,11 @@ where
 
         match Pin::new(&mut this.msg_receiver).poll_next(cx) {
             Poll::Ready(Some(Err(BroadcastStreamRecvError::Lagged(_)))) => {
-                tracing::info!(monotonic_counter.apollo_router_skipped_event_count = 1u64,);
+                u64_counter!(
+                    "apollo_router_skipped_event_count",
+                    "Amount of times the router missed subscription events",
+                    1u64
+                );
                 self.poll_next(cx)
             }
             Poll::Ready(None) => Poll::Ready(None),

apollo-router/src/plugins/authentication/mod.rs

@@ -539,8 +539,6 @@ fn authenticate(
     jwks_manager: &JwksManager,
     request: router::Request,
 ) -> ControlFlow<router::Response, router::Request> {
-    const AUTHENTICATION_KIND: &str = "JWT";
-
     // We are going to do a lot of similar checking so let's define a local function
     // to help reduce repetition
     fn failure_message(
@@ -549,17 +547,16 @@ fn authenticate(
         status: StatusCode,
     ) -> ControlFlow<router::Response, router::Request> {
         // This is a metric and will not appear in the logs
-        tracing::info!(
-            monotonic_counter.apollo_authentication_failure_count = 1u64,
-            kind = %AUTHENTICATION_KIND
+        u64_counter!(
+            "apollo_authentication_failure_count",
+            "Number of requests with failed JWT authentication (deprecated)",
+            1,
+            kind = "JWT"
         );
-        tracing::info!(
-            monotonic_counter
-                .apollo
-                .router
-                .operations
-                .authentication
-                .jwt = 1,
+        u64_counter!(
+            "apollo.router.operations.authentication.jwt",
+            "Number of requests with JWT authentication",
+            1,
             authentication.jwt.failed = true
         );
         tracing::info!(message = %error, "jwt authentication failure");
@@ -662,11 +659,17 @@ fn authenticate(
             );
         }
         // This is a metric and will not appear in the logs
-        tracing::info!(
-            monotonic_counter.apollo_authentication_success_count = 1u64,
-            kind = %AUTHENTICATION_KIND
+        u64_counter!(
+            "apollo_authentication_success_count",
+            "Number of requests with successful JWT authentication (deprecated)",
+            1,
+            kind = "JWT"
+        );
+        u64_counter!(
+            "apollo.router.operations.jwt",
+            "Number of requests with JWT authentication",
+            1
         );
-        tracing::info!(monotonic_counter.apollo.router.operations.jwt = 1u64);
         return ControlFlow::Continue(request);
     }
 

apollo-router/src/plugins/authentication/subgraph.rs

@@ -409,17 +409,21 @@ impl SigningParamsConfig {
 }
 
 fn increment_success_counter(subgraph_name: &str) {
-    tracing::info!(
-        monotonic_counter.apollo.router.operations.authentication.aws.sigv4 = 1u64,
+    u64_counter!(
+        "apollo.router.operations.authentication.aws.sigv4",
+        "",
+        1,
         authentication.aws.sigv4.failed = false,
-        subgraph.service.name = %subgraph_name,
+        subgraph.service.name = subgraph_name.to_string()
     );
 }
 fn increment_failure_counter(subgraph_name: &str) {
-    tracing::info!(
-        monotonic_counter.apollo.router.operations.authentication.aws.sigv4 = 1u64,
+    u64_counter!(
+        "apollo.router.operations.authentication.aws.sigv4",
+        "",
+        1,
         authentication.aws.sigv4.failed = true,
-        subgraph.service.name = %subgraph_name,
+        subgraph.service.name = subgraph_name.to_string()
     );
 }
 

apollo-router/src/plugins/authorization/mod.rs

@@ -556,8 +556,10 @@ impl Plugin for AuthorizationPlugin {
                         Ok(ControlFlow::Continue(request))
                     } else {
                         // This is a metric and will not appear in the logs
-                        tracing::info!(
-                            monotonic_counter.apollo_require_authentication_failure_count = 1u64,
+                        u64_counter!(
+                            "apollo_require_authentication_failure_count",
+                            "Number of unauthenticated requests (deprecated)",
+                            1
                         );
                         tracing::error!("rejecting unauthenticated request");
                         let response = supergraph::Response::error_builder()
@@ -588,11 +590,13 @@ impl Plugin for AuthorizationPlugin {
                 let needs_requires_scopes = request.context.contains_key(REQUIRED_SCOPES_KEY);
 
                 if needs_authenticated || needs_requires_scopes {
-                    tracing::info!(
-                        monotonic_counter.apollo.router.operations.authorization = 1u64,
+                    u64_counter!(
+                        "apollo.router.operations.authorization",
+                        "",
+                        1,
                         authorization.filtered = filtered,
                         authorization.needs_authenticated = needs_authenticated,
-                        authorization.needs_requires_scopes = needs_requires_scopes,
+                        authorization.needs_requires_scopes = needs_requires_scopes
                     );
                 }
 

apollo-router/src/plugins/subscription.rs

@@ -503,10 +503,12 @@ impl Service<router::Request> for CallbackService {
                                 };
                                 // Keep the subscription to the client opened
                                 payload.subscribed = Some(true);
-                                tracing::info!(
-                                        monotonic_counter.apollo.router.operations.subscriptions.events = 1u64,
-                                        subscriptions.mode="callback"
-                                    );
+                                u64_counter!(
+                                    "apollo.router.operations.subscriptions.events",
+                                    "Number of subscription events",
+                                    1,
+                                    subscriptions.mode = "callback"
+                                );
                                 handle.send_sync(payload)?;
 
                                 Ok(router::Response {
@@ -626,10 +628,12 @@ impl Service<router::Request> for CallbackService {
                                             });
                                          }
                                     };
-                                    tracing::info!(
-                                        monotonic_counter.apollo.router.operations.subscriptions.events = 1u64,
-                                        subscriptions.mode="callback",
-                                        subscriptions.complete=true
+                                    u64_counter!(
+                                        "apollo.router.operations.subscriptions.events",
+                                        "Number of subscription events",
+                                        1,
+                                        subscriptions.mode = "callback",
+                                        subscriptions.complete = true
                                     );
                                     if let Err(_err) = handle.send_sync(
                                         graphql::Response::builder().errors(errors).build(),

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

@@ -131,7 +131,6 @@ use crate::plugins::telemetry::reload::OPENTELEMETRY_TRACER_HANDLE;
 use crate::plugins::telemetry::tracing::apollo_telemetry::decode_ftv1_trace;
 use crate::plugins::telemetry::tracing::apollo_telemetry::APOLLO_PRIVATE_OPERATION_SIGNATURE;
 use crate::plugins::telemetry::tracing::TracingConfigurator;
-use crate::plugins::telemetry::utils::TracingUtils;
 use crate::query_planner::OperationKind;
 use crate::register_plugin;
 use crate::router_factory::Endpoint;
@@ -1761,14 +1760,30 @@ impl Telemetry {
             || tracing_zipkin_used
             || tracing_datadog_used
         {
-            ::tracing::info!(
-                monotonic_counter.apollo.router.operations.telemetry = 1u64,
-                telemetry.metrics.otlp = metrics_otlp_used.or_empty(),
-                telemetry.metrics.prometheus = metrics_prom_used.or_empty(),
-                telemetry.tracing.otlp = tracing_otlp_used.or_empty(),
-                telemetry.tracing.datadog = tracing_datadog_used.or_empty(),
-                telemetry.tracing.jaeger = tracing_jaeger_used.or_empty(),
-                telemetry.tracing.zipkin = tracing_zipkin_used.or_empty(),
+            let mut attributes = Vec::new();
+            if metrics_otlp_used {
+                attributes.push(KeyValue::new("telemetry.metrics.otlp", true));
+            }
+            if metrics_prom_used {
+                attributes.push(KeyValue::new("telemetry.metrics.prometheus", true));
+            }
+            if tracing_otlp_used {
+                attributes.push(KeyValue::new("telemetry.tracing.otlp", true));
+            }
+            if tracing_datadog_used {
+                attributes.push(KeyValue::new("telemetry.tracing.datadog", true));
+            }
+            if tracing_jaeger_used {
+                attributes.push(KeyValue::new("telemetry.tracing.jaeger", true));
+            }
+            if tracing_zipkin_used {
+                attributes.push(KeyValue::new("telemetry.tracing.zipkin", true));
+            }
+            u64_counter!(
+                "apollo.router.operations.telemetry",
+                "Telemetry systems in use",
+                1,
+                &attributes
             );
         }
     }

apollo-router/src/plugins/traffic_shaping/timeout/future.rs

@@ -49,7 +49,11 @@ where
         match Pin::new(&mut this.sleep).poll(cx) {
             Poll::Pending => Poll::Pending,
             Poll::Ready(_) => {
-                tracing::info!(monotonic_counter.apollo_router_timeout = 1u64,);
+                u64_counter!(
+                    "apollo_router_timeout",
+                    "Number of timed out client requests",
+                    1
+                );
                 Poll::Ready(Err(Elapsed::new().into()))
             }
         }