Dima/matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Use the upstream tracing repo

Browse Source 
The necessary patch was merged[1] now, thanks to Jonas. We still need
the patch section since we don't have a release with the patch.

[1]: https://github.com/tokio-rs/tracing/pull/3000
This commit is contained in:
Damir Jelić
2025-08-30 16:33:38 +02:00
parent 05d0f9e077
commit 79b7d6d235
2 changed files with 46 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+42 -60
View File
@@ -938,7 +938,7 @@ checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
dependencies = [
"once_cell",
"owo-colors",
"tracing-core 0.1.34",
"tracing-core",
"tracing-error",
]
@@ -1544,7 +1544,7 @@ dependencies = [
"anyhow",
"matrix-sdk",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
]
[[package]]
@@ -1556,7 +1556,7 @@ dependencies = [
"futures-util",
"matrix-sdk",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"url",
]
@@ -1567,7 +1567,7 @@ dependencies = [
"anyhow",
"matrix-sdk",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
]
[[package]]
@@ -1577,7 +1577,7 @@ dependencies = [
"anyhow",
"matrix-sdk",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"url",
]
@@ -1589,7 +1589,7 @@ dependencies = [
"matrix-sdk",
"serde",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
]
[[package]]
@@ -1601,7 +1601,7 @@ dependencies = [
"futures-util",
"matrix-sdk",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"url",
]
@@ -1612,7 +1612,7 @@ dependencies = [
"anyhow",
"matrix-sdk",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"url",
]
@@ -1623,7 +1623,7 @@ dependencies = [
"anyhow",
"matrix-sdk",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
]
[[package]]
@@ -1634,7 +1634,7 @@ dependencies = [
"matrix-sdk",
"mime",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"url",
]
@@ -1645,7 +1645,7 @@ dependencies = [
"anyhow",
"matrix-sdk",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"url",
]
@@ -1662,7 +1662,7 @@ dependencies = [
"serde",
"serde_json",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"url",
]
@@ -1677,7 +1677,7 @@ dependencies = [
"serde",
"serde_json",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
]
[[package]]
@@ -1689,7 +1689,7 @@ dependencies = [
"futures-util",
"matrix-sdk",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"url",
]
@@ -1701,7 +1701,7 @@ dependencies = [
"clap",
"matrix-sdk",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"url",
]
@@ -1715,7 +1715,7 @@ dependencies = [
"matrix-sdk",
"matrix-sdk-ui",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"url",
]
@@ -3120,7 +3120,7 @@ dependencies = [
"tokio-util",
"tower",
"tracing",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"uniffi",
"url",
"urlencoding",
@@ -3194,7 +3194,7 @@ dependencies = [
"thiserror 2.0.11",
"tokio",
"tracing",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"uniffi",
"wasm-bindgen",
"wasm-bindgen-futures",
@@ -3278,7 +3278,7 @@ dependencies = [
"tempfile",
"thiserror 2.0.11",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"uniffi",
"vergen",
"vodozemac",
@@ -3314,8 +3314,8 @@ dependencies = [
"tokio",
"tracing",
"tracing-appender",
"tracing-core 0.1.34",
"tracing-subscriber 0.3.20",
"tracing-core",
"tracing-subscriber",
"uniffi",
"url",
"uuid",
@@ -3362,7 +3362,7 @@ dependencies = [
"thiserror 2.0.11",
"tokio",
"tracing",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"uuid",
"wasm-bindgen",
"wasm-bindgen-test",
@@ -3494,7 +3494,7 @@ dependencies = [
"serde",
"serde_json",
"tokio",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"vodozemac",
"wasm-bindgen-test",
"wiremock",
@@ -3513,7 +3513,7 @@ name = "matrix-sdk-test-utils"
version = "0.13.0"
dependencies = [
"ctor",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
]
[[package]]
@@ -3672,7 +3672,7 @@ dependencies = [
"tokio",
"tracing",
"tracing-appender",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
"tui-framework-experiment",
"tui-textarea",
]
@@ -3913,14 +3913,15 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
[[package]]
name = "paranoid-android"
version = "0.2.2"
source = "git+https://github.com/element-hq/paranoid-android.git?rev=69388ac5b4afeed7be4401c70ce17f6d9a2cf19b#69388ac5b4afeed7be4401c70ce17f6d9a2cf19b"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "101795d63d371b43e38d6e7254677657be82f17022f7f7893c268f33ac0caadc"
dependencies = [
"lazy_static",
"ndk-sys",
"sharded-slab",
"smallvec",
"tracing-core 0.1.32",
"tracing-subscriber 0.3.18",
"tracing-core",
"tracing-subscriber",
]
[[package]]
@@ -5090,8 +5091,8 @@ checksum = "64e75c831b4d8b34a5aec1f65f67c5d46a26c7c5d3c7abd8b5ef430796900cf8"
dependencies = [
"sentry-backtrace",
"sentry-core",
"tracing-core 0.1.34",
"tracing-subscriber 0.3.20",
"tracing-core",
"tracing-subscriber",
]
[[package]]
@@ -5983,47 +5984,39 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
[[package]]
name = "tracing"
version = "0.1.41"
source = "git+https://github.com/element-hq/tracing.git?rev=5635147b868541d8c13d6f8c9c8558f9ddd29c6c#5635147b868541d8c13d6f8c9c8558f9ddd29c6c"
source = "git+https://github.com/tokio-rs/tracing.git?rev=20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05#20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05"
dependencies = [
"log",
"pin-project-lite",
"tracing-attributes",
"tracing-core 0.1.34",
"tracing-core",
]
[[package]]
name = "tracing-appender"
version = "0.2.3"
source = "git+https://github.com/element-hq/tracing.git?rev=5635147b868541d8c13d6f8c9c8558f9ddd29c6c#5635147b868541d8c13d6f8c9c8558f9ddd29c6c"
source = "git+https://github.com/tokio-rs/tracing.git?rev=20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05#20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05"
dependencies = [
"crossbeam-channel",
"thiserror 2.0.11",
"time",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
]
[[package]]
name = "tracing-attributes"
version = "0.1.30"
source = "git+https://github.com/element-hq/tracing.git?rev=5635147b868541d8c13d6f8c9c8558f9ddd29c6c#5635147b868541d8c13d6f8c9c8558f9ddd29c6c"
source = "git+https://github.com/tokio-rs/tracing.git?rev=20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05#20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "tracing-core"
version = "0.1.32"
source = "git+https://github.com/element-hq/tracing.git?rev=ca9431f74d37c9d3b5e6a9f35b2c706711dab7dd#ca9431f74d37c9d3b5e6a9f35b2c706711dab7dd"
dependencies = [
"once_cell",
]
[[package]]
name = "tracing-core"
version = "0.1.34"
source = "git+https://github.com/element-hq/tracing.git?rev=5635147b868541d8c13d6f8c9c8558f9ddd29c6c#5635147b868541d8c13d6f8c9c8558f9ddd29c6c"
source = "git+https://github.com/tokio-rs/tracing.git?rev=20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05#20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05"
dependencies = [
"once_cell",
"valuable",
@@ -6036,34 +6029,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
dependencies = [
"tracing",
"tracing-subscriber 0.3.20",
"tracing-subscriber",
]
[[package]]
name = "tracing-log"
version = "0.2.0"
source = "git+https://github.com/element-hq/tracing.git?rev=5635147b868541d8c13d6f8c9c8558f9ddd29c6c#5635147b868541d8c13d6f8c9c8558f9ddd29c6c"
source = "git+https://github.com/tokio-rs/tracing.git?rev=20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05#20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05"
dependencies = [
"log",
"once_cell",
"tracing-core 0.1.34",
]
[[package]]
name = "tracing-subscriber"
version = "0.3.18"
source = "git+https://github.com/element-hq/tracing.git?rev=ca9431f74d37c9d3b5e6a9f35b2c706711dab7dd#ca9431f74d37c9d3b5e6a9f35b2c706711dab7dd"
dependencies = [
"sharded-slab",
"smallvec",
"thread_local",
"tracing-core 0.1.32",
"tracing-core",
]
[[package]]
name = "tracing-subscriber"
version = "0.3.20"
source = "git+https://github.com/element-hq/tracing.git?rev=5635147b868541d8c13d6f8c9c8558f9ddd29c6c#5635147b868541d8c13d6f8c9c8558f9ddd29c6c"
source = "git+https://github.com/tokio-rs/tracing.git?rev=20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05#20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05"
dependencies = [
"matchers",
"nu-ansi-term",
@@ -6073,7 +6055,7 @@ dependencies = [
"smallvec",
"thread_local",
"tracing",
"tracing-core 0.1.34",
"tracing-core",
"tracing-log",
]
Cargo.toml
+4 -4
View File
@@ -192,7 +192,7 @@ lto = false
async-compat = { git = "https://github.com/element-hq/async-compat", rev = "5a27c8b290f1f1dcfc0c4ec22c464e38528aa591" }
const_panic = { git = "https://github.com/jplatte/const_panic", rev = "9024a4cb3eac45c1d2d980f17aaee287b17be498" }
# Needed to fix rotation log issue on Android (https://github.com/tokio-rs/tracing/issues/2937)
tracing = { git = "https://github.com/element-hq/tracing.git", rev = "5635147b868541d8c13d6f8c9c8558f9ddd29c6c" }
tracing-core = { git = "https://github.com/element-hq/tracing.git", rev = "5635147b868541d8c13d6f8c9c8558f9ddd29c6c" }
tracing-subscriber = { git = "https://github.com/element-hq/tracing.git", rev = "5635147b868541d8c13d6f8c9c8558f9ddd29c6c" }
tracing-appender = { git = "https://github.com/element-hq/tracing.git", rev = "5635147b868541d8c13d6f8c9c8558f9ddd29c6c" }
tracing = { git = "https://github.com/tokio-rs/tracing.git", rev = "20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05" }
tracing-core = { git = "https://github.com/tokio-rs/tracing.git", rev = "20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05" }
tracing-subscriber = { git = "https://github.com/tokio-rs/tracing.git", rev = "20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05" }
tracing-appender = { git = "https://github.com/tokio-rs/tracing.git", rev = "20f5b3d8ba057ca9c4ae00ad30dda3dce8a71c05" }