Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tracing subscriber after introducing Tokio-console (#8907)

Browse source 
We've also upgraded `Axum` in order to avoid having two versions of that
library in Collab (one due to Tokio-console).

Release Notes:

- N/A

---------

Co-authored-by: Conrad <conrad@zed.dev>
This commit is contained in:
Max Brunsfeld 2024-03-05 14:11:33 -08:00 • committed by GitHub
parent 703c9655a0
commit b68a277b5e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 75 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

127
Cargo.lock generated
View file

@ -1224,13 +1224,13 @@ dependencies = [
[[package]]
name = "axum"
version = "0.5.17"
version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43"
checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
dependencies = [
"async-trait",
"axum-core 0.2.9",
"base64 0.13.1",
"axum-core",
"base64 0.21.4",
"bitflags 1.3.2",
"bytes 1.5.0",
"futures-util",
@ -1239,68 +1239,25 @@ dependencies = [
"http-body",
"hyper",
"itoa",
"matchit 0.5.0",
"memchr",
"mime",
"percent-encoding",
"pin-project-lite",
"serde",
"serde_json",
"serde_urlencoded",
"sha-1 0.10.1",
"sync_wrapper",
"tokio",
"tokio-tungstenite",
"tower",
"tower-http 0.3.5",
"tower-layer",
"tower-service",
]
[[package]]
name = "axum"
version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
dependencies = [
"async-trait",
"axum-core 0.3.4",
"bitflags 1.3.2",
"bytes 1.5.0",
"futures-util",
"http 0.2.9",
"http-body",
"hyper",
"itoa",
"matchit 0.7.3",
"matchit",
"memchr",
"mime",
"percent-encoding",
"pin-project-lite",
"rustversion",
"serde",
"serde_json",
"serde_path_to_error",
"serde_urlencoded",
"sha1",
"sync_wrapper",
"tokio",
"tokio-tungstenite",
"tower",
"tower-layer",
"tower-service",
]
[[package]]
name = "axum-core"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc"
dependencies = [
"async-trait",
"bytes 1.5.0",
"futures-util",
"http 0.2.9",
"http-body",
"mime",
"tower-layer",
"tower-service",
]
[[package]]
name = "axum-core"
version = "0.3.4"
@ -1320,11 +1277,11 @@ dependencies = [
[[package]]
name = "axum-extra"
version = "0.3.7"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69034b3b0fd97923eee2ce8a47540edb21e07f48f87f67d44bb4271cec622bdb"
checksum = "f9a320103719de37b7b4da4c8eb629d4573f6bcfd3dfe80d3208806895ccf81d"
dependencies = [
"axum 0.5.17",
"axum",
"bytes 1.5.0",
"futures-util",
"http 0.2.9",
@ -2264,7 +2221,7 @@ dependencies = [
"audio",
"aws-config",
"aws-sdk-s3",
"axum 0.5.17",
"axum",
"axum-extra",
"call",
"channel",
@ -2286,7 +2243,6 @@ dependencies = [
"git",
"gpui",
"hex",
"hyper",
"indoc",
"language",
"lazy_static",
@ -2326,7 +2282,6 @@ dependencies = [
"tower",
"tower-http 0.4.4",
"tracing",
"tracing-log",
"tracing-subscriber",
"unindent",
"util",
@ -3060,6 +3015,12 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
[[package]]
name = "data-encoding"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
[[package]]
name = "data-url"
version = "0.1.1"
@ -5805,12 +5766,6 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
[[package]]
name = "matchit"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb"
[[package]]
name = "matchit"
version = "0.7.3"
@ -8853,6 +8808,16 @@ dependencies = [
"serde",
]
[[package]]
name = "serde_path_to_error"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c"
dependencies = [
"itoa",
"serde",
]
[[package]]
name = "serde_repr"
version = "0.1.16"
@ -8924,17 +8889,6 @@ dependencies = [
"opaque-debug",
]
[[package]]
name = "sha-1"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
dependencies = [
"cfg-if 1.0.0",
"cpufeatures",
"digest 0.10.7",
]
[[package]]
name = "sha1"
version = "0.10.6"
@ -10292,14 +10246,14 @@ dependencies = [
[[package]]
name = "tokio-tungstenite"
version = "0.17.2"
version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181"
checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
dependencies = [
"futures-util",
"log",
"tokio",
"tungstenite 0.17.3",
"tungstenite 0.20.1",
]
[[package]]
@ -10390,7 +10344,7 @@ checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
dependencies = [
"async-stream",
"async-trait",
"axum 0.6.20",
"axum",
"base64 0.21.4",
"bytes 1.5.0",
"h2",
@ -10443,7 +10397,6 @@ dependencies = [
"http-body",
"http-range-header",
"pin-project-lite",
"tower",
"tower-layer",
"tower-service",
]
@ -11044,7 +10997,7 @@ dependencies = [
"log",
"native-tls",
"rand 0.8.5",
"sha-1 0.9.8",
"sha-1",
"thiserror",
"url",
"utf-8",
@ -11052,18 +11005,18 @@ dependencies = [
[[package]]
name = "tungstenite"
version = "0.17.3"
version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
dependencies = [
"base64 0.13.1",
"byteorder",
"bytes 1.5.0",
"data-encoding",
"http 0.2.9",
"httparse",
"log",
"rand 0.8.5",
"sha-1 0.10.1",
"sha1",
"thiserror",
"url",
"utf-8",