Skip to content

Commit

Permalink
Make span duration rendering optional and turn it off by default
Browse files Browse the repository at this point in the history
  • Loading branch information
@oli-obk
oli-obk committed Jul 12, 2024
1 parent bbe6596 commit 70c2f67
Show file tree
Hide file tree
Showing 19 changed files with 375 additions and 306 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tracing-tree"
version = "0.3.1"
version = "0.4.0"
authors = ["David Barsky <[email protected]>", "Nathan Whitaker", "Oli Scherer <[email protected]>"]
edition = "2018"
license = "MIT OR Apache-2.0"
Expand Down
30 changes: 15 additions & 15 deletions examples/basic.stdout
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
1:main┐basic::hierarchical-example version=0.1
1:main└┐basic::hierarchical-example version=0.1
1:main └┐basic::server host="localhost", port=8080
1:main ├─ Xms INFO basic starting
1:main ├─ Xs INFO basic listening
1:main ├─ INFO basic starting
1:main ├─ INFO basic listening
1:main └┐basic::server host="localhost", port=8080
1:main └┐basic::conn peer_addr="82.9.9.9", port=42381
1:main ├─ Xms DEBUG basic connected
1:main ├─ Xms DEBUG basic message received, length=2
1:main ├─ DEBUG basic connected
1:main ├─ DEBUG basic message received, length=2
1:main ┌┘basic::conn peer_addr="82.9.9.9", port=42381
1:main ┌┘basic::server host="localhost", port=8080
1:main └┐basic::server host="localhost", port=8080
1:main └┐basic::conn peer_addr="8.8.8.8", port=18230
1:main ├─ Xms DEBUG basic connected
1:main ├─ DEBUG basic connected
1:main ┌┘basic::conn peer_addr="8.8.8.8", port=18230
1:main ┌┘basic::server host="localhost", port=8080
1:main └┐basic::server host="localhost", port=8080
1:main └┐basic::foomp 42 <- format string, normal_var=43
1:main ├─ Xms ERROR basic hello
1:main ├─ ERROR basic hello
1:main ┌┘basic::foomp 42 <- format string, normal_var=43
1:main ┌┘basic::server host="localhost", port=8080
1:main └┐basic::server host="localhost", port=8080
1:main └┐basic::conn peer_addr="82.9.9.9", port=42381
1:main ├─ Xms WARN basic weak encryption requested, algo="xor"
1:main ├─ Xms DEBUG basic response sent, length=8
1:main ├─ Xms DEBUG basic disconnected
1:main ├─ WARN basic weak encryption requested, algo="xor"
1:main ├─ DEBUG basic response sent, length=8
1:main ├─ DEBUG basic disconnected
1:main ┌┘basic::conn peer_addr="82.9.9.9", port=42381
1:main ┌┘basic::server host="localhost", port=8080
1:main └┐basic::server host="localhost", port=8080
1:main └┐basic::conn peer_addr="8.8.8.8", port=18230
1:main ├─ Xms DEBUG basic message received, length=5
1:main ├─ Xms DEBUG basic response sent, length=8
1:main ├─ Xms DEBUG basic disconnected
1:main ├─ DEBUG basic message received, length=5
1:main ├─ DEBUG basic response sent, length=8
1:main ├─ DEBUG basic disconnected
1:main ┌┘basic::conn peer_addr="8.8.8.8", port=18230
1:main ┌┘basic::server host="localhost", port=8080
1:main ├─ Xs WARN basic internal error
1:main ├─ Xs ERROR basic this is a log message
1:main ├─ Xs INFO basic exit
1:main ├─ WARN basic internal error
1:main ├─ ERROR basic this is a log message
1:main ├─ INFO basic exit
1:main ┌┘basic::server host="localhost", port=8080
1:main┌┘basic::hierarchical-example version=0.1
1:main┘basic::hierarchical-example version=0.1
30 changes: 15 additions & 15 deletions examples/basic_non_verbose.stdout
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
1:main┐basic_non_verbose::hierarchical-example version=0.1
1:main└─┐basic_non_verbose::server host="localhost", port=8080
1:main ├─ Xms INFO basic_non_verbose starting
1:main ├─ Xs INFO basic_non_verbose listening
1:main ├─ INFO basic_non_verbose starting
1:main ├─ INFO basic_non_verbose listening
1:main └─┐basic_non_verbose::conn peer_addr="82.9.9.9", port=42381
1:main ├─ Xms DEBUG basic_non_verbose connected
1:main ├─ Xms DEBUG basic_non_verbose message received, length=2
1:main ├─ DEBUG basic_non_verbose connected
1:main ├─ DEBUG basic_non_verbose message received, length=2
1:main ┌─┘
1:main └─┐basic_non_verbose::conn peer_addr="8.8.8.8", port=18230
1:main ├─ Xms DEBUG basic_non_verbose connected
1:main ├─ DEBUG basic_non_verbose connected
1:main ┌─┘
1:main └─┐basic_non_verbose::foomp 42 <- format string, normal_var=43
1:main ├─ Xms ERROR basic_non_verbose hello
1:main ├─ ERROR basic_non_verbose hello
1:main ┌─┘
1:main └─┐basic_non_verbose::conn peer_addr="82.9.9.9", port=42381
1:main ├─ Xms WARN basic_non_verbose weak encryption requested, algo="xor"
1:main ├─ Xms DEBUG basic_non_verbose response sent, length=8
1:main ├─ Xms DEBUG basic_non_verbose disconnected
1:main ├─ WARN basic_non_verbose weak encryption requested, algo="xor"
1:main ├─ DEBUG basic_non_verbose response sent, length=8
1:main ├─ DEBUG basic_non_verbose disconnected
1:main ┌─┘
1:main └─┐basic_non_verbose::conn peer_addr="8.8.8.8", port=18230
1:main ├─ Xms DEBUG basic_non_verbose message received, length=5
1:main ├─ Xms DEBUG basic_non_verbose response sent, length=8
1:main ├─ Xms DEBUG basic_non_verbose disconnected
1:main ├─ DEBUG basic_non_verbose message received, length=5
1:main ├─ DEBUG basic_non_verbose response sent, length=8
1:main ├─ DEBUG basic_non_verbose disconnected
1:main ┌─┘
1:main ├─ Xs WARN basic_non_verbose internal error
1:main ├─ Xs ERROR basic_non_verbose this is a log message
1:main ├─ Xs INFO basic_non_verbose exit
1:main ├─ WARN basic_non_verbose internal error
1:main ├─ ERROR basic_non_verbose this is a log message
1:main ├─ INFO basic_non_verbose exit
1:main┌─┘
1:main┘
30 changes: 15 additions & 15 deletions examples/basic_verbose_entry.stdout
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
1:main┐basic_verbose_entry::hierarchical-example version=0.1
1:main└┐basic_verbose_entry::hierarchical-example version=0.1
1:main └┐basic_verbose_entry::server host="localhost", port=8080
1:main ├─ Xms INFO basic_verbose_entry starting
1:main ├─ Xs INFO basic_verbose_entry listening
1:main ├─ INFO basic_verbose_entry starting
1:main ├─ INFO basic_verbose_entry listening
1:main └┐basic_verbose_entry::server host="localhost", port=8080
1:main └┐basic_verbose_entry::conn peer_addr="82.9.9.9", port=42381
1:main ├─ Xms DEBUG basic_verbose_entry connected
1:main ├─ Xms DEBUG basic_verbose_entry message received, length=2
1:main ├─ DEBUG basic_verbose_entry connected
1:main ├─ DEBUG basic_verbose_entry message received, length=2
1:main ┌─┘
1:main └┐basic_verbose_entry::server host="localhost", port=8080
1:main └┐basic_verbose_entry::conn peer_addr="8.8.8.8", port=18230
1:main ├─ Xms DEBUG basic_verbose_entry connected
1:main ├─ DEBUG basic_verbose_entry connected
1:main ┌─┘
1:main └┐basic_verbose_entry::server host="localhost", port=8080
1:main └┐basic_verbose_entry::foomp 42 <- format string, normal_var=43
1:main ├─ Xms ERROR basic_verbose_entry hello
1:main ├─ ERROR basic_verbose_entry hello
1:main ┌─┘
1:main └┐basic_verbose_entry::server host="localhost", port=8080
1:main └┐basic_verbose_entry::conn peer_addr="82.9.9.9", port=42381
1:main ├─ Xms WARN basic_verbose_entry weak encryption requested, algo="xor"
1:main ├─ Xms DEBUG basic_verbose_entry response sent, length=8
1:main ├─ Xms DEBUG basic_verbose_entry disconnected
1:main ├─ WARN basic_verbose_entry weak encryption requested, algo="xor"
1:main ├─ DEBUG basic_verbose_entry response sent, length=8
1:main ├─ DEBUG basic_verbose_entry disconnected
1:main ┌─┘
1:main └┐basic_verbose_entry::server host="localhost", port=8080
1:main └┐basic_verbose_entry::conn peer_addr="8.8.8.8", port=18230
1:main ├─ Xms DEBUG basic_verbose_entry message received, length=5
1:main ├─ Xms DEBUG basic_verbose_entry response sent, length=8
1:main ├─ Xms DEBUG basic_verbose_entry disconnected
1:main ├─ DEBUG basic_verbose_entry message received, length=5
1:main ├─ DEBUG basic_verbose_entry response sent, length=8
1:main ├─ DEBUG basic_verbose_entry disconnected
1:main ┌─┘
1:main ├─ Xs WARN basic_verbose_entry internal error
1:main ├─ Xs ERROR basic_verbose_entry this is a log message
1:main ├─ Xs INFO basic_verbose_entry exit
1:main ├─ WARN basic_verbose_entry internal error
1:main ├─ ERROR basic_verbose_entry this is a log message
1:main ├─ INFO basic_verbose_entry exit
1:main┌─┘
1:main┘
30 changes: 15 additions & 15 deletions examples/basic_verbose_exit.stdout
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
1:main┐basic_verbose_exit::hierarchical-example version=0.1
1:main└─┐basic_verbose_exit::server host="localhost", port=8080
1:main ├─ Xms INFO basic_verbose_exit starting
1:main ├─ Xs INFO basic_verbose_exit listening
1:main ├─ INFO basic_verbose_exit starting
1:main ├─ INFO basic_verbose_exit listening
1:main └─┐basic_verbose_exit::conn peer_addr="82.9.9.9", port=42381
1:main ├─ Xms DEBUG basic_verbose_exit connected
1:main ├─ Xms DEBUG basic_verbose_exit message received, length=2
1:main ├─ DEBUG basic_verbose_exit connected
1:main ├─ DEBUG basic_verbose_exit message received, length=2
1:main ┌┘basic_verbose_exit::conn peer_addr="82.9.9.9", port=42381
1:main ┌┘basic_verbose_exit::server host="localhost", port=8080
1:main └─┐basic_verbose_exit::conn peer_addr="8.8.8.8", port=18230
1:main ├─ Xms DEBUG basic_verbose_exit connected
1:main ├─ DEBUG basic_verbose_exit connected
1:main ┌┘basic_verbose_exit::conn peer_addr="8.8.8.8", port=18230
1:main ┌┘basic_verbose_exit::server host="localhost", port=8080
1:main └─┐basic_verbose_exit::foomp 42 <- format string, normal_var=43
1:main ├─ Xms ERROR basic_verbose_exit hello
1:main ├─ ERROR basic_verbose_exit hello
1:main ┌┘basic_verbose_exit::foomp 42 <- format string, normal_var=43
1:main ┌┘basic_verbose_exit::server host="localhost", port=8080
1:main └─┐basic_verbose_exit::conn peer_addr="82.9.9.9", port=42381
1:main ├─ Xms WARN basic_verbose_exit weak encryption requested, algo="xor"
1:main ├─ Xms DEBUG basic_verbose_exit response sent, length=8
1:main ├─ Xms DEBUG basic_verbose_exit disconnected
1:main ├─ WARN basic_verbose_exit weak encryption requested, algo="xor"
1:main ├─ DEBUG basic_verbose_exit response sent, length=8
1:main ├─ DEBUG basic_verbose_exit disconnected
1:main ┌┘basic_verbose_exit::conn peer_addr="82.9.9.9", port=42381
1:main ┌┘basic_verbose_exit::server host="localhost", port=8080
1:main └─┐basic_verbose_exit::conn peer_addr="8.8.8.8", port=18230
1:main ├─ Xms DEBUG basic_verbose_exit message received, length=5
1:main ├─ Xms DEBUG basic_verbose_exit response sent, length=8
1:main ├─ Xms DEBUG basic_verbose_exit disconnected
1:main ├─ DEBUG basic_verbose_exit message received, length=5
1:main ├─ DEBUG basic_verbose_exit response sent, length=8
1:main ├─ DEBUG basic_verbose_exit disconnected
1:main ┌┘basic_verbose_exit::conn peer_addr="8.8.8.8", port=18230
1:main ┌┘basic_verbose_exit::server host="localhost", port=8080
1:main ├─ Xs WARN basic_verbose_exit internal error
1:main ├─ Xs ERROR basic_verbose_exit this is a log message
1:main ├─ Xs INFO basic_verbose_exit exit
1:main ├─ WARN basic_verbose_exit internal error
1:main ├─ ERROR basic_verbose_exit this is a log message
1:main ├─ INFO basic_verbose_exit exit
1:main ┌┘basic_verbose_exit::server host="localhost", port=8080
1:main┌┘basic_verbose_exit::hierarchical-example version=0.1
1:main┘basic_verbose_exit::hierarchical-example version=0.1
22 changes: 11 additions & 11 deletions examples/concurrent.stdout
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
1:main┐concurrent::hierarchical-example version=0.1
1:main└───┐concurrent::server host="localhost", port=8080
1:main ├─── Xms INFO concurrent starting
1:main ├─── Xs INFO concurrent listening
1:main ├─── Xs DEBUG concurrent starting countdowns
1:main ├─── INFO concurrent starting
1:main ├─── INFO concurrent listening
1:main ├─── DEBUG concurrent starting countdowns
1:main └───┐concurrent::countdowns
1:main └───┐concurrent::countdown_a
1:main ├─── Xms DEBUG concurrent polling countdown, label="a", count=3
1:main ├─── DEBUG concurrent polling countdown, label="a", count=3
1:main └───┐concurrent::countdown_b
1:main ├─── Xms DEBUG concurrent polling countdown, label="b", count=5
1:main ├─── Xms DEBUG concurrent polling countdown, label="b", count=4
1:main ├─── DEBUG concurrent polling countdown, label="b", count=5
1:main ├─── DEBUG concurrent polling countdown, label="b", count=4
1:main └───┐concurrent::countdown_a
1:main ├─── Xms DEBUG concurrent polling countdown, label="a", count=2
1:main ├─── DEBUG concurrent polling countdown, label="a", count=2
1:main └───┐concurrent::conn peer_addr="82.9.9.9", port=42381
1:main ├─── Xms WARN concurrent peer1 warning
1:main ├─── WARN concurrent peer1 warning
1:main └───┐concurrent::countdowns
1:main ├─── Xms INFO concurrent finished polling countdowns
1:main ├─── INFO concurrent finished polling countdowns
1:main ┌───┘
1:main ┌───┘
1:main ┌───┘
1:main ┌───┘
1:main ├─── Xs INFO concurrent all done!
1:main ├─── Xs INFO concurrent exit
1:main ├─── INFO concurrent all done!
1:main ├─── INFO concurrent exit
1:main┌───┘
1:main┘
4 changes: 2 additions & 2 deletions examples/concurrent_eager.stdout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
1:main└───┐concurrent_eager::b
1:main┐concurrent_eager::spawn_fut key="a"
1:main└───┐concurrent_eager::a
1:main ├─── Xms INFO concurrent_eager a
1:main ├─── INFO concurrent_eager a
1:main┌───┘
1:main┐concurrent_eager::spawn_fut key="b"
1:main└───┐concurrent_eager::b
1:main ├─── Xms INFO concurrent_eager b
1:main ├─── INFO concurrent_eager b
1:main┌───┘
1:main┘
1:main┘
22 changes: 11 additions & 11 deletions examples/concurrent_verbose.stdout
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
1:main┐concurrent_verbose::hierarchical-example version=0.1
1:main└───┐concurrent_verbose::server host="localhost", port=8080
1:main ├─── Xms INFO concurrent_verbose starting
1:main ├─── Xs INFO concurrent_verbose listening
1:main ├─── Xs DEBUG concurrent_verbose starting countdowns
1:main ├─── INFO concurrent_verbose starting
1:main ├─── INFO concurrent_verbose listening
1:main ├─── DEBUG concurrent_verbose starting countdowns
1:main └─┐concurrent_verbose::server host="localhost", port=8080
1:main └─┐concurrent_verbose::countdowns
1:main └───┐concurrent_verbose::countdown_a
1:main ├─── Xms DEBUG concurrent_verbose polling countdown, label="a", count=3
1:main ├─── DEBUG concurrent_verbose polling countdown, label="a", count=3
1:main └─┐concurrent_verbose::countdowns
1:main └─┐concurrent_verbose::countdown_b
1:main ├─── Xms DEBUG concurrent_verbose polling countdown, label="b", count=5
1:main ├─── Xms DEBUG concurrent_verbose polling countdown, label="b", count=4
1:main ├─── DEBUG concurrent_verbose polling countdown, label="b", count=5
1:main ├─── DEBUG concurrent_verbose polling countdown, label="b", count=4
1:main └─┐concurrent_verbose::countdowns
1:main └─┐concurrent_verbose::countdown_a
1:main ├─── Xms DEBUG concurrent_verbose polling countdown, label="a", count=2
1:main ├─── DEBUG concurrent_verbose polling countdown, label="a", count=2
1:main └─┐concurrent_verbose::server host="localhost", port=8080
1:main └─┐concurrent_verbose::conn peer_addr="82.9.9.9", port=42381
1:main ├─── Xms WARN concurrent_verbose peer1 warning
1:main ├─── WARN concurrent_verbose peer1 warning
1:main └─┐concurrent_verbose::server host="localhost", port=8080
1:main └─┐concurrent_verbose::countdowns
1:main ├─── Xms INFO concurrent_verbose finished polling countdowns
1:main ├─── INFO concurrent_verbose finished polling countdowns
1:main ┌─┘concurrent_verbose::countdown_b
1:main ┌─┘concurrent_verbose::countdowns
1:main ┌─┘concurrent_verbose::countdown_a
Expand All @@ -28,8 +28,8 @@
1:main ┌─┘concurrent_verbose::server host="localhost", port=8080
1:main ┌─┘concurrent_verbose::conn peer_addr="82.9.9.9", port=42381
1:main ┌─┘concurrent_verbose::server host="localhost", port=8080
1:main ├─── Xs INFO concurrent_verbose all done!
1:main ├─── Xs INFO concurrent_verbose exit
1:main ├─── INFO concurrent_verbose all done!
1:main ├─── INFO concurrent_verbose exit
1:main ┌─┘concurrent_verbose::server host="localhost", port=8080
1:main┌─┘concurrent_verbose::hierarchical-example version=0.1
1:main┘concurrent_verbose::hierarchical-example version=0.1
Loading

0 comments on commit 70c2f67

Please sign in to comment.