This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Fix tracing tests #8022
Merged
Fix tracing tests #8022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The tests were not working properly. 1. Some test was setting a global subscriber, this could lead to racy conditions with other tests. 2. A logging test called `process::exit` which is completly wrong.
bkchr
added
A0-please_review
dvdplm
approved these changes
Feb 2, 2021
| let max_level_hint = Layer::<FmtSubscriber>::max_level_hint(&env_filter); | ||
|
|
||
| let max_level = max_level.unwrap_or_else(|| match max_level_hint { | ||
| let max_level = match max_level_hint { |
There was a problem hiding this comment.
Can we use tracing_subscriber::filter::LevelFilter and clean up some line noise here?
client/tracing/src/lib.rs
Outdated
|
|
||
| let event3 = events.lock().remove(0); | ||
| assert!(event3.parent_id.is_none()); | ||
| } else { |
There was a problem hiding this comment.
I think it would help readability a bit if you reversed the conditions, so that this else block became the if block. That way readers can read the code in the execution order.
| @@ -456,7 +455,7 @@ mod tests { | |||
| Box::new(handler), | |||
| "test_target", | |||
| ); | |||
| let subscriber = tracing_subscriber::fmt().finish().with(layer); | |||
| let subscriber = tracing_subscriber::fmt().with_writer(std::io::sink).finish().with(layer); | |||
There was a problem hiding this comment.
Let me se if I understand this correctly: instead of having our own TestSubscriber, you create one that writes to what is essentially /dev/null (will always succeed) and access the spans/events through the Arc'd (like before).
That seems like a much better solution.
There was a problem hiding this comment.
Yeah, I first thought that this would be one of the problems. In the end this is no problem at all, but should make the output cleaner.
Co-authored-by: David <dvdplm@gmail.com>
andresilva
approved these changes
Feb 2, 2021
| env_filter = parse_user_directives(env_filter, directives)?; | ||
| } | ||
|
|
||
| if let Some(profiling_targets) = profiling_targets { |
There was a problem hiding this comment.
I feel like I am having a déjà vu. Didn't this code use to be pretty much like this? (including the forced sc_tracing=trace directive).
cecton
pushed a commit
that referenced
this pull request
Feb 4, 2021
* Fix tracing tests The tests were not working properly. 1. Some test was setting a global subscriber, this could lead to racy conditions with other tests. 2. A logging test called `process::exit` which is completly wrong. * Update client/tracing/src/lib.rs Co-authored-by: David <dvdplm@gmail.com> * Review comments Co-authored-by: David <dvdplm@gmail.com>
ghost
pushed a commit
that referenced
this pull request
Feb 17, 2021
* Fix tracing tests (#8022) * Fix tracing tests The tests were not working properly. 1. Some test was setting a global subscriber, this could lead to racy conditions with other tests. 2. A logging test called `process::exit` which is completly wrong. * Update client/tracing/src/lib.rs Co-authored-by: David <dvdplm@gmail.com> * Review comments Co-authored-by: David <dvdplm@gmail.com> * Fix tracing spans are not being forwarded to spawned task (#8009) * Fix tracing spans are not being forwarded to spawned task There is a bug that tracing spans are not forwarded to spawned task. The problem was that only the telemetry span was forwarded. The solution to this is to use the tracing provided `in_current_span` to capture the current active span and pass the telemetry span explictely. We will now always enter the span when the future is polled. This is essentially the same strategy as tracing is doing with its `Instrumented`, but now extended for our use case with having multiple spans active. * More tests * Proper test for telemetry and prefix span * WIP * Fix test (need to create & enter the span at the same time) * WIP * Remove telemtry_span from sc_service config * CLEANUP * Update comment * Incorrect indent * More meaningful name * Dedent * Naming XD * Attempt to make a more complete test * lint * Missing licenses * Remove user data * CLEANUP * Apply suggestions from code review Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * CLEANUP * Apply suggestion * Update bin/node/cli/tests/telemetry.rs Co-authored-by: David <dvdplm@gmail.com> * Wrapping lines Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> Co-authored-by: David <dvdplm@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The tests were not working properly.
Some test was setting a global subscriber, this could lead to racy
conditions with other tests.
A logging test called
process::exitwhich is completly wrong.