Skip to content

Use consistent query name in uplink metrics #5816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
goto-bus-stop merged 2 commits into from
Aug 19, 2024
Merged

Use consistent query name in uplink metrics #5816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86cc453
Use consistent `query` name in uplink metrics
goto-bus-stop Aug 14, 2024
d2fea7d
changeset
goto-bus-stop Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changesets/fix_renee_consistent_uplink_type.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
### Fix inconsistent `type` attribute in `apollo.router.uplink.fetch.duration` metric ([PR #5816](https://github.com/apollographql/router/pull/5816))

The router now always reports a short name in the `type` attribute for the `apollo.router.fetch.duration` metric, instead of sometimes using a fully-qualified Rust path and sometimes using a short name.

By [@goto-bus-stop](https://github.com/goto-bus-stop) in https://github.com/apollographql/router/pull/5816
4 changes: 2 additions & 2 deletions apollo-router/src/uplink/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ where
tracing::info!(
histogram.apollo_router_uplink_fetch_duration_seconds =
now.elapsed().as_secs_f64(),
query = std::any::type_name::<Query>(),
query,
url = url.to_string(),
"kind" = "http_error",
error = e.to_string(),
Expand All @@ -441,7 +441,7 @@ fn query_name<Query>() -> &'static str {
let mut query = std::any::type_name::<Query>();
query = query
.strip_suffix("Query")
.expect("Uplink structs mut be named xxxQuery")
.expect("Uplink structs must be named xxxQuery")
.get(query.rfind("::").map(|index| index + 2).unwrap_or_default()..)
.expect("cannot fail");
query
Expand Down