Skip to content

Commit 45a3289

Browse files
hawkwhawkw
committed
trace: update tracing-subscriber to 0.2.14
This picks up the following upstream changes: * tokio-rs/tracing#1064, which fixes a bug where creating a subscriber would allocate a large amount of memory that was not actually used * tokio-rs/tracing#1058, which significantly reduces the overhead of entering and exiting spans Together, these changes should improve proxy performance when tracing is enabled.
1 parent cf10f5f commit 45a3289

File tree

6 files changed

+68
-20
lines changed

6 files changed

+68
-20
lines changed

‎Cargo.lock

Lines changed: 62 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,19 @@ dependencies = [
448448
"slab",
449449
]
450450

451+
[[package]]
452+
name = "generator"
453+
version = "0.6.23"
454+
source = "registry+https://github.com/rust-lang/crates.io-index"
455+
checksum = "8cdc09201b2e8ca1b19290cf7e65de2246b8e91fb6874279722189c4de7b94dc"
456+
dependencies = [
457+
"cc",
458+
"libc",
459+
"log",
460+
"rustc_version",
461+
"winapi 0.3.8",
462+
]
463+
451464
[[package]]
452465
name = "getrandom"
453466
version = "0.1.13"
@@ -692,9 +705,9 @@ dependencies = [
692705

693706
[[package]]
694707
name = "itoa"
695-
version = "0.4.1"
708+
version = "0.4.6"
696709
source = "registry+https://github.com/rust-lang/crates.io-index"
697-
checksum = "c069bbec61e1ca5a596166e55dfe4773ff745c3d16b700013bcaff9a6df2c682"
710+
checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
698711

699712
[[package]]
700713
name = "js-sys"
@@ -1565,6 +1578,19 @@ dependencies = [
15651578
"cfg-if",
15661579
]
15671580

1581+
[[package]]
1582+
name = "loom"
1583+
version = "0.3.6"
1584+
source = "registry+https://github.com/rust-lang/crates.io-index"
1585+
checksum = "a0e8460f2f2121162705187214720353c517b97bdfb3494c0b1e33d83ebe4bed"
1586+
dependencies = [
1587+
"cfg-if",
1588+
"generator",
1589+
"scoped-tls",
1590+
"serde",
1591+
"serde_json",
1592+
]
1593+
15681594
[[package]]
15691595
name = "lru-cache"
15701596
version = "0.1.2"
@@ -2284,9 +2310,15 @@ dependencies = [
22842310

22852311
[[package]]
22862312
name = "ryu"
2287-
version = "0.2.8"
2313+
version = "1.0.5"
22882314
source = "registry+https://github.com/rust-lang/crates.io-index"
2289-
checksum = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f"
2315+
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
2316+
2317+
[[package]]
2318+
name = "scoped-tls"
2319+
version = "1.0.0"
2320+
source = "registry+https://github.com/rust-lang/crates.io-index"
2321+
checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
22902322

22912323
[[package]]
22922324
name = "scopeguard"
@@ -2324,12 +2356,26 @@ name = "serde"
23242356
version = "1.0.104"
23252357
source = "registry+https://github.com/rust-lang/crates.io-index"
23262358
checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
2359+
dependencies = [
2360+
"serde_derive",
2361+
]
2362+
2363+
[[package]]
2364+
name = "serde_derive"
2365+
version = "1.0.104"
2366+
source = "registry+https://github.com/rust-lang/crates.io-index"
2367+
checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
2368+
dependencies = [
2369+
"proc-macro2 1.0.10",
2370+
"quote 1.0.2",
2371+
"syn 1.0.21",
2372+
]
23272373

23282374
[[package]]
23292375
name = "serde_json"
2330-
version = "1.0.27"
2376+
version = "1.0.59"
23312377
source = "registry+https://github.com/rust-lang/crates.io-index"
2332-
checksum = "59790990c5115d16027f00913e2e66de23a51f70422e549d2ad68c8c5f268f1c"
2378+
checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
23332379
dependencies = [
23342380
"itoa",
23352381
"ryu",
@@ -2338,11 +2384,12 @@ dependencies = [
23382384

23392385
[[package]]
23402386
name = "sharded-slab"
2341-
version = "0.0.9"
2387+
version = "0.1.0"
23422388
source = "registry+https://github.com/rust-lang/crates.io-index"
2343-
checksum = "06d5a3f5166fb5b42a5439f2eee8b9de149e235961e3eb21c5808fc3ea17ff3e"
2389+
checksum = "7b4921be914e16899a80adefb821f8ddb7974e3f1250223575a44ed994882127"
23442390
dependencies = [
23452391
"lazy_static",
2392+
"loom",
23462393
]
23472394

23482395
[[package]]
@@ -2764,9 +2811,9 @@ dependencies = [
27642811

27652812
[[package]]
27662813
name = "tracing-core"
2767-
version = "0.1.14"
2814+
version = "0.1.17"
27682815
source = "registry+https://github.com/rust-lang/crates.io-index"
2769-
checksum = "db63662723c316b43ca36d833707cc93dff82a02ba3d7e354f342682cc8b3545"
2816+
checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
27702817
dependencies = [
27712818
"lazy_static",
27722819
]
@@ -2794,19 +2841,19 @@ dependencies = [
27942841

27952842
[[package]]
27962843
name = "tracing-serde"
2797-
version = "0.1.1"
2844+
version = "0.1.2"
27982845
source = "registry+https://github.com/rust-lang/crates.io-index"
2799-
checksum = "b6ccba2f8f16e0ed268fc765d9b7ff22e965e7185d32f8f1ec8294fe17d86e79"
2846+
checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
28002847
dependencies = [
28012848
"serde",
28022849
"tracing-core",
28032850
]
28042851

28052852
[[package]]
28062853
name = "tracing-subscriber"
2807-
version = "0.2.11"
2854+
version = "0.2.14"
28082855
source = "registry+https://github.com/rust-lang/crates.io-index"
2809-
checksum = "abd165311cc4d7a555ad11cc77a37756df836182db0d81aac908c8184c584f40"
2856+
checksum = "2810660b9d5b18895d140caba6401765749a6a162e5d0736cfc44ea50db9d79d"
28102857
dependencies = [
28112858
"ansi_term",
28122859
"chrono",
@@ -2819,6 +2866,7 @@ dependencies = [
28192866
"sharded-slab",
28202867
"smallvec",
28212868
"thread_local 1.0.1",
2869+
"tracing",
28222870
"tracing-core",
28232871
"tracing-log",
28242872
"tracing-serde",

‎linkerd/app/integration/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ tracing-futures = { version = "0.2", features = ["std-future"] }
4242
webpki = "0.21.0"
4343

4444
[dependencies.tracing-subscriber]
45-
version = "0.2.11"
45+
version = "0.2.14"
4646
# we don't need `chrono` time formatting or ANSI colored output
4747
default-features = false
4848
features = ["env-filter", "fmt", "smallvec", "tracing-log", "json", "parking_lot"]
@@ -51,7 +51,7 @@ features = ["env-filter", "fmt", "smallvec", "tracing-log", "json", "parking_lot
5151
flate2 = { version = "1.0.1", default-features = false, features = ["rust_backend"] }
5252

5353
[dev-dependencies.tracing-subscriber]
54-
version = "0.2.8"
54+
version = "0.2.14"
5555
# turn on ANSI colors for tests :)
5656
default-features = false
5757
features = ["env-filter", "fmt", "smallvec", "ansi", "tracing-log", "json", "parking_lot"]

‎linkerd/app/test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ tracing-futures = { version = "0.2", features = ["std-future"] }
3333
tracing-subscriber = "0.2.11"
3434

3535
[dev-dependencies.tracing-subscriber]
36-
version = "0.2.8"
36+
version = "0.2.14"
3737
# turn on ANSI colors for tests :)
3838
default-features = false
3939
features = ["env-filter", "fmt", "smallvec", "ansi", "tracing-log", "json", "parking_lot"]

‎linkerd/proxy/transport/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ libc = "0.2"
4949

5050
[dev-dependencies]
5151
linkerd2-identity = { path = "../../identity", features = ["test-util"] }
52-
tracing-subscriber = "0.2.11"
52+
tracing-subscriber = "0.2.14"
5353
tower = { version = "0.3", default-features = false, features = ["util"] }
5454
tracing-futures = { version = "0.2", features = ["std-future"] }

‎linkerd/stack/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ features = [
2727
[dev-dependencies]
2828
tower-test = "0.3"
2929
tokio-test = "0.2"
30-
tracing-subscriber = "0.2"
30+
tracing-subscriber = "0.2.14"
3131
tokio = { version = "0.2", features = ["time", "macros"] }

‎linkerd/tracing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tracing-futures = { version = "0.2" }
1919
tracing-log = "0.1"
2020

2121
[dependencies.tracing-subscriber]
22-
version = "0.2.11"
22+
version = "0.2.14"
2323
# we don't need `chrono` time formatting or ANSI colored output
2424
default-features = false
2525
features = ["env-filter", "fmt", "smallvec", "tracing-log", "json", "parking_lot"]

0 commit comments

Comments
 (0)