Merge branch 'dev' into tninesling/subgraph-typestate

Author: tninesling

Cargo.lock

@@ -187,7 +187,7 @@ impl Invalidation {
 
                 f64_histogram!(
                     "apollo.router.cache.invalidation.duration",
-                    "Duration of the invalidation event execution.",
+                    "Duration of the invalidation event execution, in seconds.",
                     start.elapsed().as_secs_f64()
                 );
                 res

apollo-router/src/plugins/cache/invalidation.rs

@@ -437,7 +437,7 @@ impl Service<QueryPlannerRequest> for QueryPlannerService {
 
             f64_histogram!(
                 "apollo.router.query_planning.total.duration",
-                "Duration of the time the router waited for a query plan, including both the queue time and planning time.",
+                "Duration of the time the router waited for a query plan, including both the queue time and planning time, in seconds.",
                 start.elapsed().as_secs_f64()
             );
 
@@ -593,7 +593,7 @@ pub(crate) struct QueryPlanResult {
 pub(crate) fn metric_query_planning_plan_duration(planner: &'static str, elapsed: f64) {
     f64_histogram!(
         "apollo.router.query_planning.plan.duration",
-        "Duration of the query planning.",
+        "Duration of the query planning, in seconds.",
         elapsed,
         "planner" = planner
     );

apollo-router/src/query_planner/query_planner_service.rs

@@ -148,7 +148,7 @@ impl Schema {
 
         f64_histogram!(
             "apollo.router.schema.load.duration",
-            "Time spent loading the supergraph schema.",
+            "Time spent loading the supergraph schema, in seconds.",
             start.elapsed().as_secs_f64()
         );
 

apollo-router/src/spec/schema.rs

@@ -18,6 +18,6 @@
     "graphql": "^16.5.0"
   },
   "devDependencies": {
-    "typescript": "5.8.2"
+    "typescript": "5.8.3"
   }
 }

dockerfiles/tracing/datadog-subgraph/package-lock.json

@@ -20,6 +20,6 @@
     "zipkin-javascript-opentracing": "^3.0.0"
   },
   "devDependencies": {
-    "typescript": "5.8.2"
+    "typescript": "5.8.3"
   }
 }

dockerfiles/tracing/datadog-subgraph/package.json

@@ -240,19 +240,19 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.32"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
+checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
 dependencies = [
  "clap_builder",
  "clap_derive",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.32"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
+checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1662,9 +1662,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.43.0"
+version = "1.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+checksum = "492a604e2fd7f814268a378409e6c92b5525d747d10db9a229723f55a417958c"
 dependencies = [
  "backtrace",
  "bytes",