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

subscriber: Introduce Registry; Refactor fmt::Subscriber in terms of Registry + Layers #420

Merged
merged 112 commits into from
Nov 14, 2019
Merged

subscriber: Introduce Registry; Refactor fmt::Subscriber in terms of Registry + Layers #420

Show file tree
Hide file tree
Changes from 111 commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
ef665f0
sketch traits
hawkw Oct 25, 2019
6ad0531
copy over david's code
hawkw Oct 28, 2019
4da3427
copy over more of david's code
hawkw Oct 28, 2019
a79f55f
hack up david's code a bit
hawkw Oct 28, 2019
d4015e3
it compiles
Oct 28, 2019
4e11419
replace current span stack with fmt's
Oct 29, 2019
c7f3243
address some of eliza's comments.
Oct 29, 2019
89b44e9
Change span store to be `Arc<Slab<RwLock<BigSpan>>>`, from `Arc<Slab<…
Oct 29, 2019
ff0e208
undo `RwLock`
Oct 29, 2019
66a8cac
Rename BigSpan -> Data; implement fmt-style ref counting.
Oct 29, 2019
6e213a2
address eliza's comments.
Oct 29, 2019
7fadbd4
Use release in drop; handle panic safety.
Oct 29, 2019
92feb7d
add todos
Oct 29, 2019
982ad60
remove unused.
Oct 29, 2019
7d66d4d
more fixes, sorry
Oct 29, 2019
fd8972e
thank u, eliza
Oct 29, 2019
5f81084
remove visitor; un-implement events.
Oct 29, 2019
1286700
introduce extensions, copied from `http::Extensions`
davidbarsky Oct 30, 2019
98eeada
copy over FmtLayer{Builder}
davidbarsky Oct 30, 2019
fc91041
make methods public
davidbarsky Oct 30, 2019
3c36d75
start examples
davidbarsky Oct 30, 2019
ec2bae0
bad sloggish subscriber example
davidbarsky Oct 30, 2019
54ad0be
add generic params to FmtLayer; implement a (possibly wrong) `current…
davidbarsky Oct 30, 2019
41753ba
huh
davidbarsky Oct 30, 2019
e18457c
i am bad at traits [fails to run example]
davidbarsky Oct 30, 2019
eab720a
WIP
davidbarsky Oct 31, 2019
1d379f6
it works, but i hate it
davidbarsky Oct 31, 2019
33c870a
remove dead code
davidbarsky Oct 31, 2019
a232579
Tidy, add debug + doc comments.
davidbarsky Oct 31, 2019
a3fe2ff
remove breaking bound; allowing builder to function correctly.
davidbarsky Oct 31, 2019
f24a2a6
add color-backtrace for debugging
davidbarsky Oct 31, 2019
7fcb271
visit spans with each event
davidbarsky Oct 31, 2019
d3f331f
made more complex examples, added an `EventFormatter` builder method,…
davidbarsky Oct 31, 2019
2b65f82
implement `WithExtensions`
davidbarsky Oct 31, 2019
4f44512
hmm
davidbarsky Oct 31, 2019
7c65377
with extensions
davidbarsky Oct 31, 2019
7d906ab
try fix
davidbarsky Oct 31, 2019
ec77679
try "do what fmt does"
davidbarsky Nov 1, 2019
e15527d
handle contextual parents
davidbarsky Nov 1, 2019
58c78c2
Cleanup parent visitation code at the cost of allocation
davidbarsky Nov 1, 2019
3a580e6
SVO
davidbarsky Nov 5, 2019
507487e
apply suggestions
Nov 7, 2019
123d69b
introduce `log` integration
Nov 7, 2019
3a2b94b
do parents _right_
Nov 7, 2019
1b61ed0
PR comments
Nov 8, 2019
cf2c4eb
docs and nit addressing
Nov 8, 2019
28b5822
more fixes
Nov 8, 2019
1f75cb7
get tests & examples to compile
Nov 8, 2019
06ee249
compiles now!
Nov 8, 2019
e60c865
docs improvements
hawkw Nov 8, 2019
1c67c8a
Apply docs suggestions from code review
hawkw Nov 8, 2019
4a10f03
Apply suggestions from code review
hawkw Nov 8, 2019
11d7bbd
remove `is_interested`
hawkw Nov 8, 2019
4f81432
make registry feature stable, default enabled
hawkw Nov 8, 2019
5dba060
api polish, bring back fmt subscriber
hawkw Nov 8, 2019
76e5ddc
remove `color-backtrace`
Nov 8, 2019
3bc0d8e
remove remaining examples
Nov 8, 2019
ca35eb1
use 0.0.6 slab
Nov 8, 2019
c742ab1
address some unused import warnings
Nov 9, 2019
88b9d17
rm `span.rs`
Nov 9, 2019
b01903e
reduce additional warnings
Nov 9, 2019
1e3b62b
dox
Nov 9, 2019
e5f90ba
more
Nov 9, 2019
ef92ef0
impl builder methods
Nov 9, 2019
1804c74
Apply docs suggestions from code review
hawkw Nov 9, 2019
017231d
add with_writer docs
hawkw Nov 9, 2019
917feac
make method names more consistent
hawkw Nov 9, 2019
df6c74d
shorter & more consistent builder method names
hawkw Nov 9, 2019
f1d9f23
fix doctests
hawkw Nov 9, 2019
9ab5426
add blanket LookupMetadata impl for LookupSpan
hawkw Nov 9, 2019
b6fb208
remove unneeded LookupMetadata bounds
hawkw Nov 9, 2019
6ceacf3
don't expose external types in pub APIs
hawkw Nov 9, 2019
06f3de4
better comment for `FormattedFields`
hawkw Nov 9, 2019
e5c4bb5
undo accidental change
hawkw Nov 9, 2019
722e675
fix downcasting
hawkw Nov 9, 2019
a43c778
fix test contamination from FmtLayer Always interest
hawkw Nov 9, 2019
ecbc8fb
move stack to the right place
hawkw Nov 9, 2019
711b2a1
fix json test
Nov 9, 2019
2d1de51
apply https://github.com/tokio-rs/tracing/pull/415
Nov 9, 2019
1700168
remove unneeded changes in examples
Nov 10, 2019
b39e4ca
few more
Nov 10, 2019
720bcc6
arghhh
Nov 10, 2019
209eea7
i'm gonna stroke out
Nov 10, 2019
e12f3e4
i hate whitespace
Nov 10, 2019
b40cb9f
hell yeah, it builds
Nov 10, 2019
28383d2
apply stable rustfmt; fix unused warnings
Nov 10, 2019
5e5c075
file appender example
Nov 11, 2019
eb2c324
remove file appender example
Nov 11, 2019
b19bc5c
Update tracing-subscriber/src/fmt/fmt_layer.rs
davidbarsky Nov 12, 2019
a933842
Rename `FmtLayer` to `Layer`; used as `fmt::Layer`.
Nov 12, 2019
0e785c7
fix doc tests
Nov 13, 2019
d588772
add comments on implementation details
hawkw Nov 13, 2019
cf796ae
document (and fix) downcast_raw impl
hawkw Nov 13, 2019
111d425
improve `Registry` documentation
hawkw Nov 13, 2019
fde1984
move `registry::Data` helper methods to `SpanRef`
hawkw Nov 13, 2019
5bcb55a
WIP
Nov 13, 2019
4847d5e
Merge branch 'dbarsky+eliza/registry' of github.com:tokio-rs/tracing …
Nov 13, 2019
8d2686e
more docss
Nov 13, 2019
afe5f19
top level registry usage docs
hawkw Nov 13, 2019
5670863
Merge branch 'dbarsky+eliza/registry' of https://github.com/tokio-rs/…
hawkw Nov 13, 2019
39695b6
address some of eliza's comments
Nov 13, 2019
19581a3
address some review comments.
Nov 13, 2019
30ade30
remove unused imports, reexport `FormattedFields`.
Nov 13, 2019
7f6c12d
doc fixes, tests for fmt_layer.
Nov 13, 2019
8947e87
remove unneeded change.
Nov 13, 2019
5cc2e38
docs
Nov 13, 2019
2862c8c
more docs
Nov 13, 2019
8f74ef8
Update tracing-subscriber/Cargo.toml
davidbarsky Nov 13, 2019
d95873a
remove `owning_ref` dep
Nov 13, 2019
e4027ae
address comments.
Nov 13, 2019
8a7ce32
more fixes
Nov 13, 2019
23f783a
Add `replace` method to `ExtensionsMut`.
Nov 14, 2019
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
2 changes: 1 addition & 1 deletion examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2018"
tracing = "0.1"
tracing-core = "0.1"
tracing-tower = { version = "0.1.0", path = "../tracing-tower" }
tracing-subscriber = { version = "0.1", path = "../tracing-subscriber" }
tracing-subscriber = { version = "0.1", path = "../tracing-subscriber", features = ["json", "chrono"] }
tracing-futures = { version = "0.1.0", path = "../tracing-futures" }
tracing-attributes = "0.1.2"
tracing-log = { path = "../tracing-log", version = "0.1.1", features = ["env_logger"] }
Expand Down
8 changes: 5 additions & 3 deletions tracing-subscriber/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ keywords = ["logging", "tracing", "metrics", "subscriber"]

default = ["env-filter", "smallvec", "fmt", "ansi", "chrono", "tracing-log"]
env-filter = ["matchers", "regex", "lazy_static"]
fmt = ["owning_ref"]
fmt = ["registry"]
ansi = ["fmt", "ansi_term"]
registry_unstable = []
registry = ["sharded-slab"]
json = ["tracing-serde", "serde", "serde_json"]

# Alias for `env-filter`; renamed in version 0.1.2, and will be removed in 0.2.
Expand All @@ -41,7 +41,6 @@ lazy_static = { optional = true, version = "1" }
# fmt
tracing-log = { path = "../tracing-log", version = "0.1", optional = true, default-features = false, features = ["log-tracer", "std"] }
ansi_term = { version = "0.11", optional = true }
owning_ref = { version = "0.4.0", optional = true }
chrono = { version = "0.4", optional = true }

# only required by the json feature
Expand All @@ -52,6 +51,9 @@ tracing-serde = { path = "../tracing-serde", optional = true }
# opt-in deps
parking_lot = { version = ">= 0.7, < 0.10", features = ["owning_ref"], optional = true }
davidbarsky marked this conversation as resolved.
Show resolved Hide resolved

# registry
sharded-slab = { version = "0.0.6", optional = true }

[dev-dependencies]
tracing = "0.1"
log = "0.4"
Expand Down
Loading