Unify span traversal #1431

nightkr · 2021-06-09T22:43:22Z

Motivation

Solution

Implemented as described in #1429, and migrated all internal uses of the deprecated methods. All tests passed both before and after the migration (9ec8130).

See tokio-rs#1429

Oops

tracing-flame/src/lib.rs

tracing-journald/src/lib.rs

nightkr · 2021-06-10T00:15:25Z

tracing-journald/src/lib.rs

+        for span in ctx
+            .lookup_current()


hawkw

overall, i'm in favor of this change. i think there are a few things i'd like to address before we move forward with it.

in particular:

let's make sure to do a version bump for tracing-subscriber and have all crates that depend on tracing-subscriber and use the new APIs update to require that version. otherwise, we could accidentally release a version of another crate that depends on APIs that aren't present in its minimum tracing-subscriber dependency
i'm not sure if removing Context::scope without a replacement is a great idea; i discussed that in more detail in a comment

Also, when this PR merges, it would be nice to port over the same change to tracing-subscriber 0.3 on the master branch --- we wouldn't want to accidentally revert this change in the breaking change release. We can also remove the deprecated methods on 0.3.

tracing-error/src/layer.rs

tracing-flame/src/lib.rs

tracing-subscriber/src/layer.rs

tracing-subscriber/src/fmt/fmt_layer.rs

tracing-subscriber/src/layer.rs

tracing-subscriber/src/registry/mod.rs

Co-authored-by: Eliza Weisman <eliza@buoyant.io>

…cing into feature/unified-span-iteration

tracing-subscriber/src/layer.rs

tracing-subscriber/src/registry/mod.rs

Co-authored-by: Eliza Weisman <eliza@buoyant.io>

…cing into feature/unified-span-iteration

hawkw

overall, this looks good to me. i left suggestions on some minor nitpicks in the deprecation notices, and a suggestion for improving the examples in the docs.

once those are addressed, i'll be happy to merge this.

tracing-subscriber/src/registry/mod.rs

tracing-subscriber/src/fmt/fmt_layer.rs

tracing-subscriber/src/layer.rs

tracing-subscriber/src/registry/mod.rs

Co-authored-by: Eliza Weisman <eliza@buoyant.io>

nightkr · 2021-06-17T21:48:04Z

Good catch with the versions.

…n-iteration

None of these are really related to this PR, but Clippy was unhappy...

Because GitHub still wasn't happy.

hawkw

one last concern about the examples. once that's addressed, i think this is good to merge.

tracing-subscriber/src/registry/mod.rs

Rather than keeping them merged with the doctests

hawkw

thanks for adding the tests, this looks good to me! I had some minor suggestions for how we could potentially make the tests a little cleaner, but it's up to you whether it's worth making those changes --- i would happily merge this branch as it is now!

thanks for working on this!

tracing-subscriber/src/registry/mod.rs

hawkw · 2021-06-21T17:51:58Z

tracing-subscriber/src/registry/mod.rs

+        let last_entered_scope = Arc::new(Mutex::new(Vec::new()));
+        #[derive(Default)]
+        struct PrintingLayer {
+            last_entered_scope: Arc<Mutex<Vec<&'static str>>>,


this works and is fine, but an alternative way of writing these tests could just be to have the layer itself make the assertions. you could construct it with a VecDeque<Vec<&'static str>>, with the expected spans at each on_enter call in order, and every time on_enter is called, you could pop the front of the deque and assert that it matches what you get from collecting the iterator. this might be a bit simpler than sharing state between the layer and the rest of the test, but either approach is fine.

It would mean losing the Arc, which would be nice. On the other hand, I'm not a huge fan of the way that that decouples the action from the expected outcome.

yeah, either way works fine --- it is nice to have the assertions made in the body of the test. i'm happy either way!

tracing-subscriber/src/registry/mod.rs

Co-authored-by: Eliza Weisman <eliza@buoyant.io>

hawkw

okay, this looks fantastic --- thanks @teozkr for sticking with this, i know it took a while to get through the review process, but i'm really happy about this change.

if you have the time, it would be nice to port these changes forwards to v0.3, on the master branch, as well --- we can simply remove all the deprecated APIs in the 0.3 version.

thanks again for working on this!

Fixes tokio-rs#1429 (forwardport from v0.1.x branch) Implemented as described in tokio-rs#1429, and migrated all internal uses of the deprecated methods. All tests passed both before and after the migration (9ec8130). - Add a new method `SpanRef::scope(&self)` that returns a leaf-to-root `Iterator`, including the specified leaf - Add a new method `Scope::from_root(self)` (where `Scope` is the type returned by `SpanRef::scope` defined earlier) that returns a root-to-leaf `Iterator` that ends at the current leaf (in other words: it's essentially the same as `Scope::collect::<Vec<_>>().into_iter().rev()`) - Deprecate all existing iterators, since they can be replaced by the new unified mechanism: - `Span::parents` is equivalent to `Span::scope().skip(1)` (although the `skip` is typically a bug) - `Span::from_root` is equivalent to `Span::scope().skip(1).from_root()` (although the `skip` is typically a bug) - `Context::scope` is equivalent to `Context::lookup_current().scope().from_root()` (although the `lookup_current` is sometimes a bug, see also tokio-rs#1428)

Forward-port of #1431 and #1434 * subscriber: unify span traversal (#1431) ## Motivation Fixes #1429 (forwardport from v0.1.x branch) ## Solution Implemented as described in #1429, and migrated all internal uses of the deprecated methods. All tests passed both before and after the migration (9ec8130). - Add a new method `SpanRef::scope(&self)` that returns a leaf-to-root `Iterator`, including the specified leaf - Add a new method `Scope::from_root(self)` (where `Scope` is the type returned by `SpanRef::scope` defined earlier) that returns a root-to-leaf `Iterator` that ends at the current leaf (in other words: it's essentially the same as `Scope::collect::<Vec<_>>().into_iter().rev()`) - Deprecate all existing iterators, since they can be replaced by the new unified mechanism: - `Span::parents` is equivalent to `Span::scope().skip(1)` (although the `skip` is typically a bug) - `Span::from_root` is equivalent to `Span::scope().skip(1).from_root()` (although the `skip` is typically a bug) - `Context::scope` is equivalent to `Context::lookup_current().scope().from_root()` (although the `lookup_current` is sometimes a bug, see also #1428) * subscriber: add Context method for resolving an Event's SpanRef (#1434) ## Motivation Fixes #1428 (forward-port from v0.1.x) ## Solution Adds a new `Context::event_span` method as proposed in the issue. No existing formatters were changed to use it yet, that seems like a secondary issue (especially if they already work correctly).

## Motivation `tracing-subscriber` currently contains some APIs that were deprecated in the v0.2.x series: - `fmt::LayerBuilder`, which is now a type alias for `fmt::Layer` (as the `Layer` type can expose all the same methods as the builder) - `registry::SpanRef::parent_id`, which doesn't play nice with per-layer filtering, - `fmt::Layer::inherit_fields`, which no longer does anything as it's now the default behavior - `fmt::Layer::on_event`, which was renamed to `fmt_event` - the `SpanRef::parents` and `layer::Context::scope` iterators, which were replaced by the APIs added in #1431 and #1434 Prior to releasing v0.3, the deprecated APIs should be removed. ## Solution This branch deletes the deprecated APIs, with the exception of `SpanRef::parents` and `Context::scope` (which were already removed in 240d11a). Signed-off-by: Eliza Weisman <eliza@buoyant.io>

@Folyd

# 0.3.0 (Oct 22, 2021) This is a breaking release of `tracing-subscriber`. The primary breaking change in this release is the removal of the dependency on the [`chrono` crate], due to [RUSTSEC-2020-0159]. To replace `chrono`, support is added for formatting timestamps using the [`time` crate] instead. In addition, this release includes a number of other breaking API changes, such as adding (limited) support for `#![no_std]` targets, removing previously deprecated APIs, and more. ### Breaking Changes - Removed APIs deprecated in the v0.2.x release series. - Renamed `Layer::new_span` to `Layer::on_new_span` ([#1674]) - Removed `Layer` impl for `Arc<L: Layer<S>>` and `Arc<dyn Layer<S> + ...>` ([#1649]) - Replaced the [`chrono` crate] with the [`time` crate] for timestamp formatting, to resolve [RUSTSEC-2020-0159] ([#1646]) - Removed `json` and `env-filter` from default features. They must now be enabled explictly ([#1647]) - Changed `FormatEvent::format_event` and `FormatFields::format_fields` trait methods to take a `Writer` type, rather than a `&mut dyn fmt::Write` trait object ([#1661]) - Changed the signature of the `MakeWriter` trait by adding a lifetime parameter ([#781]) ### Changed - **layer**: Renamed `Layer::new_span` to `Layer::on_new_span` ([#1674]) - **fmt**: Changed `FormatEvent::format_event` and `FormatFields::format_fields` trait methods to take a `Writer` type, rather than a `&mut dyn fmt::Write` trait object ([#1661]) - **json**, **env-filter**: `json` and `env-filter` feature flags are no longer enabled by default ([#1647]) ### Removed - Removed deprecated `CurrentSpan` type ([#1320]) - **registry**: Removed deprecated `SpanRef::parents` iterator, replaced by `SpanRef::scope` in [#1431] ([#1648)]) - **layer**: Removed deprecated `Context::scope` iterator, replaced by `Context::span_scope` and `Context::event_scope` in [#1431] and [#1434] ([#1648)]) - **layer**: Removed `Layer` impl for `Arc<L: Layer<S>>` and `Arc<dyn Layer<S> + ...>`. These interfere with per-layer filtering. ([#1649]) - **fmt**: Removed deprecated `LayerBuilder` type ([#1673]) - **fmt**: Removed `fmt::Layer::on_event` (renamed to `fmt::Layer::fmt_event`) ([#1673]) - **fmt**, **chrono**: Removed the `chrono` feature flag and APIs for using the [`chrono` crate] for timestamp formatting ([#1646]) ### Added - **fmt**, **time**: `LocalTime` and `UtcTime` types for formatting timestamps using the [`time` crate] ([#1646]) - **fmt**: Added a lifetime parameter to the `MakeWriter` trait, allowing it to return a borrowed writer. This enables implementations of `MakeWriter` for types such as `Mutex<T: io::Write>` and `std::fs::File`. ([#781]) - **env-filter**: Documentation improvements ([#1637]) - Support for some APIs on `#![no_std]` targets, by disabling the `std` feature flag ([#1660]) Thanks to @Folyd and @nmathewson for contributing to this release! [#1320]: #1320 [#1673]: #1673 [#1674]: #1674 [#1646]: #1646 [#1647]: #1647 [#1648]: #1648 [#1649]: #1649 [#1660]: #1660 [#1661]: #1661 [#1431]: #1431 [#1434]: #1434 [#781]: #781 [`chrono` crate]: https://crates.io/crates/chrono [`time` crate]: https://crates.io/crates/time [RUSTSEC-2020-0159]: https://rustsec.org/advisories/RUSTSEC-2020-0159.html

@Folyd

# 0.3.0 (Oct 22, 2021) This is a breaking release of `tracing-subscriber`. The primary breaking change in this release is the removal of the dependency on the [`chrono` crate], due to [RUSTSEC-2020-0159]. To replace `chrono`, support is added for formatting timestamps using the [`time` crate] instead. In addition, this release includes a number of other breaking API changes, such as adding (limited) support for `#![no_std]` targets, removing previously deprecated APIs, and more. ### Breaking Changes - Removed APIs deprecated in the v0.2.x release series. - Renamed `Layer::new_span` to `Layer::on_new_span` ([#1674]) - Removed `Layer` impl for `Arc<L: Layer<S>>` and `Arc<dyn Layer<S> + ...>` ([#1649]) - Replaced the [`chrono` crate] with the [`time` crate] for timestamp formatting, to resolve [RUSTSEC-2020-0159] ([#1646]) - Removed `json` and `env-filter` from default features. They must now be enabled explictly ([#1647]) - Changed `FormatEvent::format_event` and `FormatFields::format_fields` trait methods to take a `Writer` type, rather than a `&mut dyn fmt::Write` trait object ([#1661]) - Changed the signature of the `MakeWriter` trait by adding a lifetime parameter ([#781]) ### Changed - **layer**: Renamed `Layer::new_span` to `Layer::on_new_span` ([#1674]) - **fmt**: Changed `FormatEvent::format_event` and `FormatFields::format_fields` trait methods to take a `Writer` type, rather than a `&mut dyn fmt::Write` trait object ([#1661]) - **json**, **env-filter**: `json` and `env-filter` feature flags are no longer enabled by default ([#1647]) ### Removed - Removed deprecated `CurrentSpan` type ([#1320]) - **registry**: Removed deprecated `SpanRef::parents` iterator, replaced by `SpanRef::scope` in [#1431] ([#1648)]) - **layer**: Removed deprecated `Context::scope` iterator, replaced by `Context::span_scope` and `Context::event_scope` in [#1431] and [#1434] ([#1648)]) - **layer**: Removed `Layer` impl for `Arc<L: Layer<S>>` and `Arc<dyn Layer<S> + ...>`. These interfere with per-layer filtering. ([#1649]) - **fmt**: Removed deprecated `LayerBuilder` type ([#1673]) - **fmt**: Removed `fmt::Layer::on_event` (renamed to `fmt::Layer::fmt_event`) ([#1673]) - **fmt**, **chrono**: Removed the `chrono` feature flag and APIs for using the [`chrono` crate] for timestamp formatting ([#1646]) ### Added - **fmt**, **time**: `LocalTime` and `UtcTime` types for formatting timestamps using the [`time` crate] ([#1646]) - **fmt**: Added a lifetime parameter to the `MakeWriter` trait, allowing it to return a borrowed writer. This enables implementations of `MakeWriter` for types such as `Mutex<T: io::Write>` and `std::fs::File`. ([#781]) - **env-filter**: Documentation improvements ([#1637]) - Support for some APIs on `#![no_std]` targets, by disabling the `std` feature flag ([#1660]) Thanks to @Folyd and @nmathewson for contributing to this release! [#1320]: #1320 [#1673]: #1673 [#1674]: #1674 [#1646]: #1646 [#1647]: #1647 [#1648]: #1648 [#1649]: #1649 [#1660]: #1660 [#1661]: #1661 [#1431]: #1431 [#1434]: #1434 [#781]: #781 [`chrono` crate]: https://crates.io/crates/chrono [`time` crate]: https://crates.io/crates/time [RUSTSEC-2020-0159]: https://rustsec.org/advisories/RUSTSEC-2020-0159.html Signed-off-by: Eliza Weisman <eliza@buoyant.io>

@Folyd

# 0.3.0 (Oct 22, 2021) This is a breaking release of `tracing-subscriber`. The primary breaking change in this release is the removal of the dependency on the [`chrono` crate], due to [RUSTSEC-2020-0159]. To replace `chrono`, support is added for formatting timestamps using the [`time` crate] instead. In addition, this release includes a number of other breaking API changes, such as adding (limited) support for `#![no_std]` targets, removing previously deprecated APIs, and more. ### Breaking Changes - Removed APIs deprecated in the v0.2.x release series. - Renamed `Layer::new_span` to `Layer::on_new_span` ([#1674]) - Removed `Layer` impl for `Arc<L: Layer<S>>` and `Arc<dyn Layer<S> + ...>` ([#1649]) - Replaced the [`chrono` crate] with the [`time` crate] for timestamp formatting, to resolve [RUSTSEC-2020-0159] ([#1646]) - Removed `json` and `env-filter` from default features. They must now be enabled explictly ([#1647]) - Changed `FormatEvent::format_event` and `FormatFields::format_fields` trait methods to take a `Writer` type, rather than a `&mut dyn fmt::Write` trait object ([#1661]) - Changed the signature of the `MakeWriter` trait by adding a lifetime parameter ([#781]) ### Changed - **layer**: Renamed `Layer::new_span` to `Layer::on_new_span` ([#1674]) - **fmt**: Changed `FormatEvent::format_event` and `FormatFields::format_fields` trait methods to take a `Writer` type, rather than a `&mut dyn fmt::Write` trait object ([#1661]) - **json**, **env-filter**: `json` and `env-filter` feature flags are no longer enabled by default ([#1647]) ### Removed - Removed deprecated `CurrentSpan` type ([#1320]) - **registry**: Removed deprecated `SpanRef::parents` iterator, replaced by `SpanRef::scope` in [#1431] ([#1648)]) - **layer**: Removed deprecated `Context::scope` iterator, replaced by `Context::span_scope` and `Context::event_scope` in [#1431] and [#1434] ([#1648)]) - **layer**: Removed `Layer` impl for `Arc<L: Layer<S>>` and `Arc<dyn Layer<S> + ...>`. These interfere with per-layer filtering. ([#1649]) - **fmt**: Removed deprecated `LayerBuilder` type ([#1673]) - **fmt**: Removed `fmt::Layer::on_event` (renamed to `fmt::Layer::fmt_event`) ([#1673]) - **fmt**, **chrono**: Removed the `chrono` feature flag and APIs for using the [`chrono` crate] for timestamp formatting ([#1646]) ### Added - **fmt**, **time**: `LocalTime` and `UtcTime` types for formatting timestamps using the [`time` crate] ([#1646]) - **fmt**: Added a lifetime parameter to the `MakeWriter` trait, allowing it to return a borrowed writer. This enables implementations of `MakeWriter` for types such as `Mutex<T: io::Write>` and `std::fs::File`. ([#781]) - **env-filter**: Documentation improvements ([#1637]) - Support for some APIs on `#![no_std]` targets, by disabling the `std` feature flag ([#1660]) Thanks to @Folyd and @nmathewson for contributing to this release! [#1320]: tokio-rs/tracing#1320 [#1673]: tokio-rs/tracing#1673 [#1674]: tokio-rs/tracing#1674 [#1646]: tokio-rs/tracing#1646 [#1647]: tokio-rs/tracing#1647 [#1648]: tokio-rs/tracing#1648 [#1649]: tokio-rs/tracing#1649 [#1660]: tokio-rs/tracing#1660 [#1661]: tokio-rs/tracing#1661 [#1431]: tokio-rs/tracing#1431 [#1434]: tokio-rs/tracing#1434 [#781]: tokio-rs/tracing#781 [`chrono` crate]: https://crates.io/crates/chrono [`time` crate]: https://crates.io/crates/time [RUSTSEC-2020-0159]: https://rustsec.org/advisories/RUSTSEC-2020-0159.html Signed-off-by: Eliza Weisman <eliza@buoyant.io>

## Motivation Fixes tokio-rs#1429 ## Solution Implemented as described in tokio-rs#1429, and migrated all internal uses of the deprecated methods. All tests passed both before and after the migration (9ec8130). - Add a new method `SpanRef::scope(&self)` that returns a leaf-to-root `Iterator`, including the specified leaf - Add a new method `Scope::from_root(self)` (where `Scope` is the type returned by `SpanRef::scope` defined earlier) that returns a root-to-leaf `Iterator` that ends at the current leaf (in other words: it's essentially the same as `Scope::collect::<Vec<_>>().into_iter().rev()`) - Deprecate all existing iterators, since they can be replaced by the new unified mechanism: - `Span::parents` is equivalent to `Span::scope().skip(1)` (although the `skip` is typically a bug) - `Span::from_root` is equivalent to `Span::scope().skip(1).from_root()` (although the `skip` is typically a bug) - `Context::scope` is equivalent to `Context::lookup_current().scope().from_root()` (although the `lookup_current` is sometimes a bug, see also tokio-rs#1428)

## Motivation `tracing-subscriber` currently contains some APIs that were deprecated in the v0.2.x series: - `fmt::LayerBuilder`, which is now a type alias for `fmt::Layer` (as the `Layer` type can expose all the same methods as the builder) - `registry::SpanRef::parent_id`, which doesn't play nice with per-layer filtering, - `fmt::Layer::inherit_fields`, which no longer does anything as it's now the default behavior - `fmt::Layer::on_event`, which was renamed to `fmt_event` - the `SpanRef::parents` and `layer::Context::scope` iterators, which were replaced by the APIs added in tokio-rs#1431 and tokio-rs#1434 Prior to releasing v0.3, the deprecated APIs should be removed. ## Solution This branch deletes the deprecated APIs, with the exception of `SpanRef::parents` and `Context::scope` (which were already removed in 240d11a). Signed-off-by: Eliza Weisman <eliza@buoyant.io>

@Folyd

# 0.3.0 (Oct 22, 2021) This is a breaking release of `tracing-subscriber`. The primary breaking change in this release is the removal of the dependency on the [`chrono` crate], due to [RUSTSEC-2020-0159]. To replace `chrono`, support is added for formatting timestamps using the [`time` crate] instead. In addition, this release includes a number of other breaking API changes, such as adding (limited) support for `#![no_std]` targets, removing previously deprecated APIs, and more. ### Breaking Changes - Removed APIs deprecated in the v0.2.x release series. - Renamed `Layer::new_span` to `Layer::on_new_span` ([tokio-rs#1674]) - Removed `Layer` impl for `Arc<L: Layer<S>>` and `Arc<dyn Layer<S> + ...>` ([tokio-rs#1649]) - Replaced the [`chrono` crate] with the [`time` crate] for timestamp formatting, to resolve [RUSTSEC-2020-0159] ([tokio-rs#1646]) - Removed `json` and `env-filter` from default features. They must now be enabled explictly ([tokio-rs#1647]) - Changed `FormatEvent::format_event` and `FormatFields::format_fields` trait methods to take a `Writer` type, rather than a `&mut dyn fmt::Write` trait object ([tokio-rs#1661]) - Changed the signature of the `MakeWriter` trait by adding a lifetime parameter ([tokio-rs#781]) ### Changed - **layer**: Renamed `Layer::new_span` to `Layer::on_new_span` ([tokio-rs#1674]) - **fmt**: Changed `FormatEvent::format_event` and `FormatFields::format_fields` trait methods to take a `Writer` type, rather than a `&mut dyn fmt::Write` trait object ([tokio-rs#1661]) - **json**, **env-filter**: `json` and `env-filter` feature flags are no longer enabled by default ([tokio-rs#1647]) ### Removed - Removed deprecated `CurrentSpan` type ([tokio-rs#1320]) - **registry**: Removed deprecated `SpanRef::parents` iterator, replaced by `SpanRef::scope` in [tokio-rs#1431] ([tokio-rs#1648)]) - **layer**: Removed deprecated `Context::scope` iterator, replaced by `Context::span_scope` and `Context::event_scope` in [tokio-rs#1431] and [tokio-rs#1434] ([tokio-rs#1648)]) - **layer**: Removed `Layer` impl for `Arc<L: Layer<S>>` and `Arc<dyn Layer<S> + ...>`. These interfere with per-layer filtering. ([tokio-rs#1649]) - **fmt**: Removed deprecated `LayerBuilder` type ([tokio-rs#1673]) - **fmt**: Removed `fmt::Layer::on_event` (renamed to `fmt::Layer::fmt_event`) ([tokio-rs#1673]) - **fmt**, **chrono**: Removed the `chrono` feature flag and APIs for using the [`chrono` crate] for timestamp formatting ([tokio-rs#1646]) ### Added - **fmt**, **time**: `LocalTime` and `UtcTime` types for formatting timestamps using the [`time` crate] ([tokio-rs#1646]) - **fmt**: Added a lifetime parameter to the `MakeWriter` trait, allowing it to return a borrowed writer. This enables implementations of `MakeWriter` for types such as `Mutex<T: io::Write>` and `std::fs::File`. ([tokio-rs#781]) - **env-filter**: Documentation improvements ([tokio-rs#1637]) - Support for some APIs on `#![no_std]` targets, by disabling the `std` feature flag ([tokio-rs#1660]) Thanks to @Folyd and @nmathewson for contributing to this release! [tokio-rs#1320]: tokio-rs#1320 [tokio-rs#1673]: tokio-rs#1673 [tokio-rs#1674]: tokio-rs#1674 [tokio-rs#1646]: tokio-rs#1646 [tokio-rs#1647]: tokio-rs#1647 [tokio-rs#1648]: tokio-rs#1648 [tokio-rs#1649]: tokio-rs#1649 [tokio-rs#1660]: tokio-rs#1660 [tokio-rs#1661]: tokio-rs#1661 [tokio-rs#1431]: tokio-rs#1431 [tokio-rs#1434]: tokio-rs#1434 [tokio-rs#781]: tokio-rs#781 [`chrono` crate]: https://crates.io/crates/chrono [`time` crate]: https://crates.io/crates/time [RUSTSEC-2020-0159]: https://rustsec.org/advisories/RUSTSEC-2020-0159.html Signed-off-by: Eliza Weisman <eliza@buoyant.io>

nightkr added 5 commits June 9, 2021 23:12

Implement SpanRef::scope and SpanRef::scope.from_root iterators

0e45e83

See tokio-rs#1429

Implement smallvec optimization for SpanScopeFromRoot

5c379fb

Replace legacy span iterator implementations with SpanRef::scope

cd8148f

Migrate tracing-subscriber to SpanRef::scope

84afb38

Migrate layer crates to use SpanRef::scope

9ec8130

nightkr requested review from hawkw, yaahc and a team as code owners June 9, 2021 22:43

nightkr changed the title ~~Feature/unified span iteration~~ Unify span iteration Jun 9, 2021

nightkr added 2 commits June 10, 2021 00:46

Reverted tracing-error span iteration order

d12cd51

Oops

Fixed flipped scope order in tracing-journald

4d0fd19

nightkr commented Jun 9, 2021

View reviewed changes

tracing-flame/src/lib.rs Outdated Show resolved Hide resolved

tracing-journald/src/lib.rs Show resolved Hide resolved

tracing-journald/src/lib.rs Show resolved Hide resolved

nightkr commented Jun 10, 2021

View reviewed changes

tracing-journald/src/lib.rs

Comment on lines +160 to +161

for span in ctx

.lookup_current()

Copy link

Contributor Author

nightkr Jun 10, 2021

Choose a reason for hiding this comment

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

#1428

nightkr changed the title ~~Unify span iteration~~ Unify span traversal Jun 10, 2021

hawkw requested changes Jun 10, 2021

View reviewed changes

nightkr and others added 6 commits June 10, 2021 22:30

Bump tracing-subscriber version

8d162d4

Update tracing-subscriber/src/fmt/fmt_layer.rs

cafb3a6

Co-authored-by: Eliza Weisman <eliza@buoyant.io>

Correct note about Scope::from_root allocating

b31e9d7

Merge branch 'feature/unified-span-iteration' of github.com:appva/tra…

0d1294d

…cing into feature/unified-span-iteration

Add example for Scope::from_root

5bad9d4

Mention Scope::from_root in SpanRef::scope

72d6a9e

hawkw reviewed Jun 10, 2021

View reviewed changes

tracing-subscriber/src/layer.rs Outdated Show resolved Hide resolved

tracing-subscriber/src/registry/mod.rs Show resolved Hide resolved

tracing-subscriber/src/registry/mod.rs Outdated Show resolved Hide resolved

tracing-subscriber/src/registry/mod.rs Outdated Show resolved Hide resolved

nightkr and others added 6 commits June 11, 2021 11:33

Turn layer::Scope back into a newtype

681f7cb

Add usage examples for SpanRef::scope

82004f9

Update tracing-subscriber/src/registry/mod.rs

3e94ef6

Co-authored-by: Eliza Weisman <eliza@buoyant.io>

Update tracing-subscriber/src/registry/mod.rs

1fb6ccd

Co-authored-by: Eliza Weisman <eliza@buoyant.io>

Simplify tracing-flame span iteration

1a47484

Merge branch 'feature/unified-span-iteration' of github.com:appva/tra…

3c9386f

…cing into feature/unified-span-iteration

This comment has been minimized.

Sign in to view

Only build layer::Scope Iterator when registry is enabled

5319df0

hawkw reviewed Jun 17, 2021

View reviewed changes

Apply suggestions from code review

00fb1dc

Co-authored-by: Eliza Weisman <eliza@buoyant.io>

nightkr added 6 commits June 18, 2021 00:26

Show SpanRef::scope examples in an actual Layer

235ab89

Merge remote-tracking branch 'origin/v0.1.x' into feature/unified-spa…

3c917b2

…n-iteration

Fix Clippy warnings

cb41242

None of these are really related to this PR, but Clippy was unhappy...

Fix the rest of the Clippy warnings

2b093df

Because GitHub still wasn't happy.

Rustfmt

8774877

Fix broken doctests on MSRV (1.42.0)

a9eb2d5

hawkw requested changes Jun 19, 2021

View reviewed changes

tracing-subscriber/src/registry/mod.rs Outdated Show resolved Hide resolved

Move SpanRef::scope assertions into real tests

b651701

Rather than keeping them merged with the doctests

hawkw approved these changes Jun 21, 2021

View reviewed changes

hawkw reviewed Jun 21, 2021

View reviewed changes

tracing-subscriber/src/registry/mod.rs Outdated Show resolved Hide resolved

tracing-subscriber/src/registry/mod.rs Outdated Show resolved Hide resolved

tracing-subscriber/src/registry/mod.rs Outdated Show resolved Hide resolved

nightkr and others added 2 commits June 22, 2021 11:22

Apply suggestions from code review

7ef5c0a

Co-authored-by: Eliza Weisman <eliza@buoyant.io>

Use subscriber guard consistently in scope tests

1f32622

hawkw approved these changes Jun 22, 2021

View reviewed changes

hawkw merged commit 7a01260 into tokio-rs:v0.1.x Jun 22, 2021

nightkr mentioned this pull request Jun 24, 2021

Unify span traversal: 0.3.x edition #1445

Merged

hawkw mentioned this pull request Oct 22, 2021

subscriber: remove deprecated APIs #1673

Merged

hawkw mentioned this pull request Oct 22, 2021

subscriber: prepare to release v0.3.0 #1677

Merged

davidbarsky mentioned this pull request Sep 26, 2023

chore: backport roughly a year's worth of changes #2728

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unify span traversal #1431

Unify span traversal #1431

nightkr commented Jun 9, 2021 •

edited

Loading

nightkr Jun 10, 2021

hawkw left a comment

This comment has been minimized.

hawkw left a comment

nightkr commented Jun 17, 2021

hawkw left a comment

hawkw left a comment

hawkw Jun 21, 2021

nightkr Jun 22, 2021

hawkw Jun 22, 2021

hawkw left a comment

Unify span traversal #1431

Unify span traversal #1431

Conversation

nightkr commented Jun 9, 2021 • edited Loading

Motivation

Solution

nightkr Jun 10, 2021

Choose a reason for hiding this comment

hawkw left a comment

Choose a reason for hiding this comment

This comment has been minimized.

hawkw left a comment

Choose a reason for hiding this comment

nightkr commented Jun 17, 2021

hawkw left a comment

Choose a reason for hiding this comment

hawkw left a comment

Choose a reason for hiding this comment

hawkw Jun 21, 2021

Choose a reason for hiding this comment

nightkr Jun 22, 2021

Choose a reason for hiding this comment

hawkw Jun 22, 2021

Choose a reason for hiding this comment

hawkw left a comment

Choose a reason for hiding this comment

nightkr commented Jun 9, 2021 •

edited

Loading