Skip to content
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

Jump to bottom

add the missing skip_all on instrument attributes #287

Merged
merged 4 commits into from
Jan 5, 2022
Merged

add the missing skip_all on instrument attributes #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f429e43
add the missing skip_all on instrument attributes
Geal Dec 21, 2021
c34d39c
remove unused argument
Geal Jan 5, 2022
c02df51
Merge branch 'main' into missing_skip_all
Geal Jan 5, 2022
919fe25
update licenses?
Geal Jan 5, 2022
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
3 changes: 1 addition & 2 deletions apollo-router-core/src/query_planner/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,9 @@ pub(crate) enum PlanNode {

impl QueryPlan {
/// Validate the entire request for variables and services used.
#[tracing::instrument(name = "validation", level = "debug")]
#[tracing::instrument(name = "validation", level = "debug", skip_all)]
pub fn validate_request(
&self,
request: &Request,
service_registry: Arc<dyn ServiceRegistry>,
) -> Result<(), Response> {
let mut early_errors = Vec::new();
Expand Down
2 changes: 1 addition & 1 deletion apollo-router-core/src/query_planner/router_bridge_query_planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ impl RouterBridgeQueryPlanner {

#[async_trait]
impl QueryPlanner for RouterBridgeQueryPlanner {
#[tracing::instrument(name = "plan", level = "debug")]
#[tracing::instrument(name = "plan", level = "debug", skip_all)]
async fn get(
&self,
query: String,
Expand Down
6 changes: 3 additions & 3 deletions apollo-router/src/apollo_router.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ impl ApolloRouter {

#[async_trait::async_trait]
impl Router<ApolloPreparedQuery> for ApolloRouter {
#[tracing::instrument(level = "debug")]
#[tracing::instrument(level = "debug", skip_all)]
async fn prepare_query(
&self,
request: &Request,
Expand Down Expand Up @@ -103,7 +103,7 @@ impl Router<ApolloPreparedQuery> for ApolloRouter {
.await?;

tracing::debug!("query plan\n{:#?}", query_plan);
query_plan.validate_request(request, Arc::clone(&self.service_registry))?;
query_plan.validate_request(Arc::clone(&self.service_registry))?;

Ok(ApolloPreparedQuery {
query_plan,
Expand All @@ -125,7 +125,7 @@ pub struct ApolloPreparedQuery {

#[async_trait::async_trait]
impl PreparedQuery for ApolloPreparedQuery {
#[tracing::instrument(level = "debug")]
#[tracing::instrument(level = "debug", skip_all)]
async fn execute(self, request: Arc<Request>) -> ResponseStream {
let mut response = self
.query_plan
Expand Down
1 change: 1 addition & 0 deletions licenses.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4210,6 +4210,7 @@ <h4>Used by:</h4>
<li><a href=" https://github.com/bluss/indexmap ">indexmap</a></li>
<li><a href=" https://github.com/rust-itertools/itertools ">itertools</a></li>
<li><a href=" https://github.com/dtolnay/itoa ">itoa</a></li>
<li><a href=" https://github.com/dtolnay/itoa ">itoa</a></li>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I keep having to add it again, while the licenses file from main is already fine 🤔

<li><a href=" https://github.com/rustwasm/wasm-bindgen/tree/master/crates/js-sys ">js-sys</a></li>
<li><a href=" https://github.com/rust-lang-nursery/lazy-static.rs ">lazy_static</a></li>
<li><a href=" https://github.com/indiv0/lazycell ">lazycell</a></li>
Expand Down