Skip to content

Commit 26b48a7

Browse files
committed
chore: print parent of retrace chain root during pre_open
The previous behavior was to print the parent of the new span, leading to a parent being printed twice if the parent was also included in the retrace chain.
1 parent f861bac commit 26b48a7

File tree

4 files changed

+32
-29
lines changed

4 files changed

+32
-29
lines changed

examples/concurrent_eager.stdout

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
1:main┐concurrent_eager::spawn_fut key="a"
22
1:main┐concurrent_eager::spawn_fut key="b"
33
1:main┐concurrent_eager::spawn_fut key="a"
4-
1:main├─┐concurrent_eager::spawn_fut key="a"
5-
1:main│ └─┐concurrent_eager::a
4+
1:main├───┐concurrent_eager::a
65
1:main┐concurrent_eager::spawn_fut key="b"
7-
1:main├─┐concurrent_eager::spawn_fut key="b"
8-
1:main│ └─┐concurrent_eager::b
6+
1:main├───┐concurrent_eager::b
97
1:main┐concurrent_eager::spawn_fut key="a"
10-
1:main├─┐concurrent_eager::spawn_fut key="a"
11-
1:main│ └─┐concurrent_eager::a
8+
1:main├───┐concurrent_eager::a
129
1:main│ ├─── Xms INFO concurrent_eager a
1310
1:main├───┘
1411
1:main┐concurrent_eager::spawn_fut key="b"
15-
1:main├─┐concurrent_eager::spawn_fut key="b"
16-
1:main│ └─┐concurrent_eager::b
12+
1:main├───┐concurrent_eager::b
1713
1:main│ ├─── Xms INFO concurrent_eager b
1814
1:main├───┘
1915
1:main┘

examples/concurrent_verbose.stdout

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
1:main┐concurrent_verbose::hierarchical-example version=0.1
2-
1:main├─┐concurrent_verbose::hierarchical-example version=0.1
3-
1:main│ └─┐concurrent_verbose::server host="localhost", port=8080
2+
1:main├───┐concurrent_verbose::server host="localhost", port=8080
43
1:main│ ├─── Xms INFO concurrent_verbose starting
54
1:main│ ├─── Xs INFO concurrent_verbose listening
65
1:main│ ├─── Xs DEBUG concurrent_verbose starting countdowns
7-
1:main│ ├───┐concurrent_verbose::countdowns
8-
1:main│ │ ─┐concurrent_verbose::countdowns
9-
1:main│ │ │ └─┐concurrent_verbose::countdown_a
6+
1:main│ ├─┐concurrent_verbose::server host="localhost", port=8080
7+
1:main│ │ ─┐concurrent_verbose::countdowns
8+
1:main│ │ ├───┐concurrent_verbose::countdown_a
109
1:main│ │ │ ├─── Xms DEBUG concurrent_verbose polling countdown, label="a", count=3
11-
1:main│ │ ├───┐concurrent_verbose::countdown_b
10+
1:main│ │ ├─┐concurrent_verbose::countdowns
11+
1:main│ │ │ └─┐concurrent_verbose::countdown_b
1212
1:main│ │ │ ├─── Xms DEBUG concurrent_verbose polling countdown, label="b", count=5
1313
1:main│ │ │ ├─── Xms DEBUG concurrent_verbose polling countdown, label="b", count=4
14-
1:main│ │ ├───┐concurrent_verbose::countdown_a
14+
1:main│ │ ├─┐concurrent_verbose::countdowns
15+
1:main│ │ │ └─┐concurrent_verbose::countdown_a
1516
1:main│ │ │ ├─── Xms DEBUG concurrent_verbose polling countdown, label="a", count=2
16-
1:main│ ├───┐concurrent_verbose::conn peer_addr="82.9.9.9", port=42381
17+
1:main│ ├─┐concurrent_verbose::server host="localhost", port=8080
18+
1:main│ │ └─┐concurrent_verbose::conn peer_addr="82.9.9.9", port=42381
1719
1:main│ │ ├─── Xms WARN concurrent_verbose peer1 warning
18-
1:main│ ├───┐concurrent_verbose::countdowns
20+
1:main│ ├─┐concurrent_verbose::server host="localhost", port=8080
21+
1:main│ │ └─┐concurrent_verbose::countdowns
1922
1:main│ │ ├─── Xms INFO concurrent_verbose finished polling countdowns
2023
1:main│ │ │ ┌─┘concurrent_verbose::countdown_b
2124
1:main│ │ ├─┘concurrent_verbose::countdowns

examples/deferred.stdout

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,35 @@
11
-> This prints before the span open message
22
1:main┐open: deferred::hierarchical-example version=0.1
3-
1:main├┐pre_open: deferred::hierarchical-example version=0.1
4-
1:main│└┐open(v): deferred::server host="localhost", port=8080
3+
1:main├─┐open: deferred::server host="localhost", port=8080
54
1:main│ ├─ Xms INFO deferred starting
65
1:main│ ├─ Xs INFO deferred listening
76
-> Deferring two levels of spans
8-
1:main│ ├─┐open: deferred::connections
9-
1:main│ │ ├┐pre_open: deferred::connections
10-
1:main│ │ │└┐open(v): deferred::conn peer_addr="82.9.9.9", port=42381
7+
1:main│ ├┐pre_open: deferred::server host="localhost", port=8080
8+
1:main│ │└┐open(v): deferred::connections
9+
1:main│ │ ├─┐open: deferred::conn peer_addr="82.9.9.9", port=42381
1110
1:main│ │ │ ├─ Xms DEBUG deferred connected, peer="peer1"
1211
1:main│ │ │ ├─ Xms DEBUG deferred message received, length=2
1312
1:main│ │ │┌┘close(v): deferred::conn peer_addr="82.9.9.9", port=42381
1413
1:main│ │ ├┘post_close: deferred::connections
15-
1:main│ │ ├─┐open: deferred::conn peer_addr="8.8.8.8", port=18230
14+
1:main│ │ ├┐pre_open: deferred::connections
15+
1:main│ │ │└┐open(v): deferred::conn peer_addr="8.8.8.8", port=18230
1616
1:main│ │ │ ├─ Xms DEBUG deferred connected, peer="peer3"
1717
1:main│ │ │┌┘close(v): deferred::conn peer_addr="8.8.8.8", port=18230
1818
1:main│ │ ├┘post_close: deferred::connections
19-
1:main│ │ ├─┐open: deferred::foomp 42 <- format string, normal_var=43
19+
1:main│ │ ├┐pre_open: deferred::connections
20+
1:main│ │ │└┐open(v): deferred::foomp 42 <- format string, normal_var=43
2021
1:main│ │ │ ├─ Xms ERROR deferred hello
2122
1:main│ │ │┌┘close(v): deferred::foomp 42 <- format string, normal_var=43
2223
1:main│ │ ├┘post_close: deferred::connections
23-
1:main│ │ ├─┐open: deferred::conn peer_addr="82.9.9.9", port=42381
24+
1:main│ │ ├┐pre_open: deferred::connections
25+
1:main│ │ │└┐open(v): deferred::conn peer_addr="82.9.9.9", port=42381
2426
1:main│ │ │ ├─ Xms WARN deferred weak encryption requested, algo="xor"
2527
1:main│ │ │ ├─ Xms DEBUG deferred response sent, length=8
2628
1:main│ │ │ ├─ Xms DEBUG deferred disconnected
2729
1:main│ │ │┌┘close(v): deferred::conn peer_addr="82.9.9.9", port=42381
2830
1:main│ │ ├┘post_close: deferred::connections
29-
1:main│ │ ├─┐open: deferred::conn peer_addr="8.8.8.8", port=18230
31+
1:main│ │ ├┐pre_open: deferred::connections
32+
1:main│ │ │└┐open(v): deferred::conn peer_addr="8.8.8.8", port=18230
3033
1:main│ │ │ ├─ Xms DEBUG deferred message received, length=5
3134
1:main│ │ │ ├─ Xms DEBUG deferred response sent, length=8
3235
1:main│ │ │ ├─ Xms DEBUG deferred disconnected

src/lib.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,11 @@ where
307307
false
308308
};
309309

310-
let verbose = i == 1 && pre_open && span.id() == new_span_id;
311-
// Print the parent of the new span if `pre_open==true`
312-
if verbose {
310+
// Print the parent of the first span
311+
let mut verbose = false;
312+
if i == 0 && pre_open {
313313
if let Some(span) = span.parent() {
314+
verbose = true;
314315
self.write_span_info(&span, bufs, SpanMode::PreOpen);
315316
}
316317
}

0 commit comments

Comments
 (0)