zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-21 03:18:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert change to tracing (#10578)

Browse Source 
Although we thought this fixed the bug, it just worked around it, and
runnign two copies of tracing in one app is a bad idea.

Simplify default RUST_LOG in development to avoid
 https://github.com/tokio-rs/tracing/issues/2927#issuecomment-2040080189



Release Notes:

- N/A
This commit is contained in:
Conrad Irwin 2024-04-15 14:00:56 -06:00 committed by GitHub
parent fda3c91f16
commit f2fc84ab44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 46 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
Cargo.lock generated
View File

@ -520,7 +520,7 @@ dependencies = [
"polling 3.3.2", "polling 3.3.2",
"rustix 0.38.32", "rustix 0.38.32",
"slab", "slab",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -861,7 +861,7 @@ dependencies = [
"ring 0.17.7", "ring 0.17.7",
"time", "time",
"tokio", "tokio",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"zeroize", "zeroize",
] ]
@ -897,7 +897,7 @@ dependencies = [
"http-body", "http-body",
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"uuid", "uuid",
] ]
@ -926,7 +926,7 @@ dependencies = [
"once_cell", "once_cell",
"percent-encoding", "percent-encoding",
"regex-lite", "regex-lite",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"url", "url",
] ]
@ -949,7 +949,7 @@ dependencies = [
"http 0.2.9", "http 0.2.9",
"once_cell", "once_cell",
"regex-lite", "regex-lite",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
] ]
[[package]] [[package]]
@ -971,7 +971,7 @@ dependencies = [
"http 0.2.9", "http 0.2.9",
"once_cell", "once_cell",
"regex-lite", "regex-lite",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
] ]
[[package]] [[package]]
@ -994,7 +994,7 @@ dependencies = [
"http 0.2.9", "http 0.2.9",
"once_cell", "once_cell",
"regex-lite", "regex-lite",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
] ]
[[package]] [[package]]
@ -1022,7 +1022,7 @@ dependencies = [
"sha2 0.10.7", "sha2 0.10.7",
"subtle", "subtle",
"time", "time",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"zeroize", "zeroize",
] ]
@ -1055,7 +1055,7 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
"sha1", "sha1",
"sha2 0.10.7", "sha2 0.10.7",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
] ]
[[package]] [[package]]
@ -1087,7 +1087,7 @@ dependencies = [
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"pin-utils", "pin-utils",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
] ]
[[package]] [[package]]
@ -1131,7 +1131,7 @@ dependencies = [
"pin-utils", "pin-utils",
"rustls", "rustls",
"tokio", "tokio",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
] ]
[[package]] [[package]]
@ -1146,7 +1146,7 @@ dependencies = [
"http 0.2.9", "http 0.2.9",
"pin-project-lite", "pin-project-lite",
"tokio", "tokio",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"zeroize", "zeroize",
] ]
@ -1194,7 +1194,7 @@ dependencies = [
"aws-smithy-types", "aws-smithy-types",
"http 0.2.9", "http 0.2.9",
"rustc_version", "rustc_version",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
] ]
[[package]] [[package]]
@ -1517,7 +1517,7 @@ dependencies = [
"futures-io", "futures-io",
"futures-lite 2.2.0", "futures-lite 2.2.0",
"piper", "piper",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
] ]
[[package]] [[package]]
@ -2275,7 +2275,7 @@ dependencies = [
"toml 0.8.10", "toml 0.8.10",
"tower", "tower",
"tower-http 0.4.4", "tower-http 0.4.4",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"tracing-subscriber", "tracing-subscriber",
"unindent", "unindent",
"util", "util",
@ -4573,7 +4573,7 @@ dependencies = [
"slab", "slab",
"tokio", "tokio",
"tokio-util", "tokio-util",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
] ]
[[package]] [[package]]
@ -4884,7 +4884,7 @@ dependencies = [
"socket2 0.4.9", "socket2 0.4.9",
"tokio", "tokio",
"tower-service", "tower-service",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"want", "want",
] ]
@ -5199,7 +5199,7 @@ dependencies = [
"polling 2.8.0", "polling 2.8.0",
"slab", "slab",
"sluice", "sluice",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"tracing-futures", "tracing-futures",
"url", "url",
"waker-fn", "waker-fn",
@ -7165,7 +7165,7 @@ dependencies = [
"concurrent-queue", "concurrent-queue",
"pin-project-lite", "pin-project-lite",
"rustix 0.38.32", "rustix 0.38.32",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -8069,7 +8069,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"strum", "strum",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"util", "util",
"zstd", "zstd",
] ]
@ -8436,7 +8436,7 @@ dependencies = [
"strum", "strum",
"thiserror", "thiserror",
"time", "time",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"url", "url",
"uuid", "uuid",
] ]
@ -9210,7 +9210,7 @@ dependencies = [
"time", "time",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"url", "url",
"uuid", "uuid",
"webpki-roots", "webpki-roots",
@ -9297,7 +9297,7 @@ dependencies = [
"stringprep", "stringprep",
"thiserror", "thiserror",
"time", "time",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"uuid", "uuid",
"whoami", "whoami",
] ]
@ -9342,7 +9342,7 @@ dependencies = [
"stringprep", "stringprep",
"thiserror", "thiserror",
"time", "time",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"uuid", "uuid",
"whoami", "whoami",
] ]
@ -9367,7 +9367,7 @@ dependencies = [
"serde", "serde",
"sqlx-core", "sqlx-core",
"time", "time",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"url", "url",
"uuid", "uuid",
] ]
@ -10200,7 +10200,7 @@ dependencies = [
"futures-sink", "futures-sink",
"pin-project-lite", "pin-project-lite",
"tokio", "tokio",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
] ]
[[package]] [[package]]
@ -10295,7 +10295,7 @@ dependencies = [
"tokio", "tokio",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
] ]
[[package]] [[package]]
@ -10332,7 +10332,7 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
] ]
[[package]] [[package]]
@ -10356,16 +10356,7 @@ dependencies = [
"log", "log",
"pin-project-lite", "pin-project-lite",
"tracing-attributes", "tracing-attributes",
"tracing-core 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "tracing-core",
]
[[package]]
name = "tracing"
version = "0.1.40"
source = "git+https://github.com/tokio-rs/tracing?rev=tracing-subscriber-0.3.18#8b7a1dde69797b33ecfa20da71e72eb5e61f0b25"
dependencies = [
"pin-project-lite",
"tracing-core 0.1.32 (git+https://github.com/tokio-rs/tracing?rev=tracing-subscriber-0.3.18)",
] ]
[[package]] [[package]]
@ -10384,14 +10375,6 @@ name = "tracing-core"
version = "0.1.32" version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
dependencies = [
"once_cell",
]
[[package]]
name = "tracing-core"
version = "0.1.32"
source = "git+https://github.com/tokio-rs/tracing?rev=tracing-subscriber-0.3.18#8b7a1dde69797b33ecfa20da71e72eb5e61f0b25"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"valuable", "valuable",
@ -10404,32 +10387,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
dependencies = [ dependencies = [
"pin-project", "pin-project",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
] ]
[[package]] [[package]]
name = "tracing-log" name = "tracing-log"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/tokio-rs/tracing?rev=tracing-subscriber-0.3.18#8b7a1dde69797b33ecfa20da71e72eb5e61f0b25" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
dependencies = [ dependencies = [
"log", "log",
"once_cell", "once_cell",
"tracing-core 0.1.32 (git+https://github.com/tokio-rs/tracing?rev=tracing-subscriber-0.3.18)", "tracing-core",
] ]
[[package]] [[package]]
name = "tracing-serde" name = "tracing-serde"
version = "0.1.3" version = "0.1.3"
source = "git+https://github.com/tokio-rs/tracing?rev=tracing-subscriber-0.3.18#8b7a1dde69797b33ecfa20da71e72eb5e61f0b25" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
dependencies = [ dependencies = [
"serde", "serde",
"tracing-core 0.1.32 (git+https://github.com/tokio-rs/tracing?rev=tracing-subscriber-0.3.18)", "tracing-core",
] ]
[[package]] [[package]]
name = "tracing-subscriber" name = "tracing-subscriber"
version = "0.3.18" version = "0.3.18"
source = "git+https://github.com/tokio-rs/tracing?rev=tracing-subscriber-0.3.18#8b7a1dde69797b33ecfa20da71e72eb5e61f0b25" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
dependencies = [ dependencies = [
"matchers", "matchers",
"nu-ansi-term", "nu-ansi-term",
@ -10440,8 +10426,8 @@ dependencies = [
"sharded-slab", "sharded-slab",
"smallvec", "smallvec",
"thread_local", "thread_local",
"tracing 0.1.40 (git+https://github.com/tokio-rs/tracing?rev=tracing-subscriber-0.3.18)", "tracing",
"tracing-core 0.1.32 (git+https://github.com/tokio-rs/tracing?rev=tracing-subscriber-0.3.18)", "tracing-core",
"tracing-log", "tracing-log",
"tracing-serde", "tracing-serde",
] ]
@ -11295,7 +11281,7 @@ dependencies = [
"anyhow", "anyhow",
"log", "log",
"once_cell", "once_cell",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"wasmtime", "wasmtime",
"wasmtime-c-api-macros", "wasmtime-c-api-macros",
] ]
@ -11507,7 +11493,7 @@ dependencies = [
"system-interface", "system-interface",
"thiserror", "thiserror",
"tokio", "tokio",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"url", "url",
"wasmtime", "wasmtime",
"wiggle", "wiggle",
@ -11744,7 +11730,7 @@ dependencies = [
"async-trait", "async-trait",
"bitflags 2.4.2", "bitflags 2.4.2",
"thiserror", "thiserror",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"wasmtime", "wasmtime",
"wiggle-macro", "wiggle-macro",
] ]
@ -12500,7 +12486,7 @@ dependencies = [
"serde_repr", "serde_repr",
"sha1", "sha1",
"static_assertions", "static_assertions",
"tracing 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "tracing",
"uds_windows", "uds_windows",
"windows-sys 0.52.0", "windows-sys 0.52.0",
"xdg-home", "xdg-home",

2
Procfile
View File

@ -1,3 +1,3 @@
collab: RUST_LOG=${RUST_LOG:-warn,tower_http=info,collab=info} cargo run --package=collab serve collab: RUST_LOG=${RUST_LOG:-info} cargo run --package=collab serve
livekit: livekit-server --dev livekit: livekit-server --dev
blob_store: ./script/run-local-minio blob_store: ./script/run-local-minio

2
crates/collab/Cargo.toml
View File

@ -64,7 +64,7 @@ toml.workspace = true
tower = "0.4" tower = "0.4"
tower-http = { workspace = true, features = ["trace"] } tower-http = { workspace = true, features = ["trace"] }
tracing = "0.1.40" tracing = "0.1.40"
tracing-subscriber = { git = "https://github.com/tokio-rs/tracing", rev = "tracing-subscriber-0.3.18", features = ["env-filter", "json", "registry", "tracing-log"] } # workaround for https://github.com/tokio-rs/tracing/issues/2927 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json", "registry", "tracing-log"] } # workaround for https://github.com/tokio-rs/tracing/issues/2927
util.workspace = true util.workspace = true
uuid.workspace = true uuid.workspace = true