Skip to content

Commit 27b6af3

Browse files
authored
tracing: just control ansi colors with feature flags (#1006)
Now that we have updated the proxy to Rust 1.52.1, we can use the `resolver = "2"` cargo feature, which results in feature flags enabled by dev-dependencies *not* enable features in the main build. This lets us toggle ANSI colors on and off using a dev-dependency without them being enabled in the primary release build. Furthermore, all tracing initialization for tests is now instrumented via the `linkerd-tracing` so that it can be more easily reused. Closes #997
1 parent dec8958 commit 27b6af3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1268
-292
lines changed

Cargo.lock

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,6 @@ version = "1.0.0"
125125
source = "registry+https://github.com/rust-lang/crates.io-index"
126126
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
127127

128-
[[package]]
129-
name = "chrono"
130-
version = "0.4.19"
131-
source = "registry+https://github.com/rust-lang/crates.io-index"
132-
checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
133-
dependencies = [
134-
"libc",
135-
"num-integer",
136-
"num-traits",
137-
"winapi",
138-
]
139-
140128
[[package]]
141129
name = "cmake"
142130
version = "0.1.45"
@@ -744,12 +732,12 @@ dependencies = [
744732
"linkerd-app-core",
745733
"linkerd-app-test",
746734
"linkerd-io",
735+
"linkerd-tracing",
747736
"thiserror",
748737
"tokio",
749738
"tokio-test",
750739
"tower",
751740
"tracing",
752-
"tracing-subscriber",
753741
]
754742

755743
[[package]]
@@ -767,6 +755,7 @@ dependencies = [
767755
"linkerd-app-core",
768756
"linkerd-app-test",
769757
"linkerd-metrics",
758+
"linkerd-tracing",
770759
"linkerd2-proxy-api",
771760
"regex",
772761
"rustls",
@@ -796,13 +785,13 @@ dependencies = [
796785
"linkerd-identity",
797786
"linkerd-io",
798787
"linkerd-retry",
788+
"linkerd-tracing",
799789
"pin-project",
800790
"thiserror",
801791
"tokio",
802792
"tokio-test",
803793
"tower",
804794
"tracing",
805-
"tracing-subscriber",
806795
]
807796

808797
[[package]]
@@ -834,11 +823,11 @@ dependencies = [
834823
"futures",
835824
"linkerd-error",
836825
"linkerd-stack",
826+
"linkerd-tracing",
837827
"parking_lot",
838828
"tokio",
839829
"tower",
840830
"tracing",
841-
"tracing-subscriber",
842831
]
843832

844833
[[package]]
@@ -1154,14 +1143,14 @@ dependencies = [
11541143
"linkerd-proxy-transport",
11551144
"linkerd-stack",
11561145
"linkerd-timeout",
1146+
"linkerd-tracing",
11571147
"pin-project",
11581148
"rand",
11591149
"thiserror",
11601150
"tokio",
11611151
"tokio-test",
11621152
"tower",
11631153
"tracing",
1164-
"tracing-subscriber",
11651154
"try-lock",
11661155
]
11671156

@@ -1324,13 +1313,13 @@ dependencies = [
13241313
"dyn-clone",
13251314
"futures",
13261315
"linkerd-error",
1316+
"linkerd-tracing",
13271317
"pin-project",
13281318
"tokio",
13291319
"tokio-test",
13301320
"tower",
13311321
"tower-test",
13321322
"tracing",
1333-
"tracing-subscriber",
13341323
]
13351324

13361325
[[package]]
@@ -1385,13 +1374,13 @@ dependencies = [
13851374
"linkerd-io",
13861375
"linkerd-proxy-transport",
13871376
"linkerd-stack",
1377+
"linkerd-tracing",
13881378
"rustls",
13891379
"thiserror",
13901380
"tokio",
13911381
"tokio-rustls",
13921382
"tower",
13931383
"tracing",
1394-
"tracing-subscriber",
13951384
"untrusted",
13961385
"webpki",
13971386
]
@@ -1595,16 +1584,6 @@ dependencies = [
15951584
"winapi",
15961585
]
15971586

1598-
[[package]]
1599-
name = "num-integer"
1600-
version = "0.1.44"
1601-
source = "registry+https://github.com/rust-lang/crates.io-index"
1602-
checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
1603-
dependencies = [
1604-
"autocfg",
1605-
"num-traits",
1606-
]
1607-
16081587
[[package]]
16091588
name = "num-traits"
16101589
version = "0.2.14"
@@ -2373,12 +2352,11 @@ dependencies = [
23732352

23742353
[[package]]
23752354
name = "tracing-subscriber"
2376-
version = "0.2.16"
2355+
version = "0.2.17"
23772356
source = "registry+https://github.com/rust-lang/crates.io-index"
2378-
checksum = "8ab8966ac3ca27126141f7999361cc97dd6fb4b71da04c02044fa9045d98bb96"
2357+
checksum = "705096c6f83bf68ea5d357a6aa01829ddbdac531b357b45abeca842938085baa"
23792358
dependencies = [
23802359
"ansi_term",
2381-
"chrono",
23822360
"lazy_static",
23832361
"matchers",
23842362
"parking_lot",

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
[workspace]
2+
# Cargo should not unify feature flags across dev-dependencies and build
3+
# dependencies. This will be the default behavior in Rust 2021.
4+
resolver = "2"
5+
26
members = [
37
"hyper-balance",
48
"linkerd/addr",

0 commit comments

Comments
 (0)