diff --git a/Cargo.lock b/Cargo.lock index e88a04f..0b5c7d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2170,9 +2170,9 @@ dependencies = [ [[package]] name = "object_store" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efc4f07659e11cd45a341cd24d71e683e3be65d9ff1f8150061678fe60437496" +checksum = "4c1be0c6c22ec0817cdc77d3842f721a17fd30ab6965001415b5402a74e6b740" dependencies = [ "async-trait", "bytes", @@ -2200,9 +2200,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "opentelemetry" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf416e4cb72756655126f7dd7bb0af49c674f4c1b9903e80c009e0c37e552e6" +checksum = "b84bcd6ae87133e903af7ef497404dda70c60d0ea14895fc8a5e6722754fc2a0" dependencies = [ "futures-core", "futures-sink", @@ -2214,9 +2214,9 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f6639e842a97dbea8886e3439710ae463120091e2e064518ba8e716e6ac36d" +checksum = "d7a6d09a73194e6b66df7c8f1b680f156d916a1a942abf2de06823dd02b7855d" dependencies = [ "async-trait", "bytes", @@ -2227,9 +2227,9 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbee664a43e07615731afc539ca60c6d9f1a9425e25ca09c57bc36c87c55852b" +checksum = "7a2366db2dca4d2ad033cad11e6ee42844fd727007af5ad04a1730f4cb8163bf" dependencies = [ "http", "opentelemetry", @@ -2246,21 +2246,22 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e046fd7660710fe5a05e8748e70d9058dc15c94ba914e7c4faa7c728f0e8ddc" +checksum = "a7175df06de5eaee9909d4805a3d07e28bb752c34cab57fa9cff549da596b30f" dependencies = [ "opentelemetry", "opentelemetry_sdk", "prost", "tonic", + "tonic-prost", ] [[package]] name = "opentelemetry_sdk" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f644aa9e5e31d11896e024305d7e3c98a88884d9f8919dbf37a9991bc47a4b" +checksum = "e14ae4f5991976fd48df6d843de219ca6d31b01daaab2dad5af2badeded372bd" dependencies = [ "futures-channel", "futures-executor", @@ -2268,7 +2269,6 @@ dependencies = [ "opentelemetry", "percent-encoding", "rand", - "serde_json", "thiserror", "tokio", "tokio-stream", @@ -2452,9 +2452,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.13.5" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" +checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d" dependencies = [ "bytes", "prost-derive", @@ -2462,9 +2462,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.13.5" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" +checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" dependencies = [ "anyhow", "itertools", @@ -3009,9 +3009,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.13.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e581ba15a835f4d9ea06c55ab1bd4dce26fc53752c69a04aac00703bfb49ba9" +checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203" dependencies = [ "async-trait", "base64", @@ -3024,7 +3024,7 @@ dependencies = [ "hyper-util", "percent-encoding", "pin-project", - "prost", + "sync_wrapper", "tokio", "tokio-stream", "tower", @@ -3033,6 +3033,17 @@ dependencies = [ "tracing", ] +[[package]] +name = "tonic-prost" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67" +dependencies = [ + "bytes", + "prost", + "tonic", +] + [[package]] name = "tower" version = "0.5.2" @@ -3139,15 +3150,16 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddcf5959f39507d0d04d6413119c04f33b623f4f951ebcbdddddfad2d0623a9c" +checksum = "1e6e5658463dd88089aba75c7791e1d3120633b1bfde22478b28f625a9bb1b8e" dependencies = [ "js-sys", - "once_cell", "opentelemetry", "opentelemetry_sdk", + "rustversion", "smallvec", + "thiserror", "tracing", "tracing-core", "tracing-log", diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 555507a..475af9b 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -38,10 +38,10 @@ path = "otlp.rs" [dependencies] datafusion = { workspace = true, features = ["parquet", "nested_expressions"] } integration-utils = { path = "../integration-utils" } -opentelemetry = { version = "0.30", features = ["trace"] } -opentelemetry-otlp = { version = "0.30", features = ["grpc-tonic"] } -opentelemetry_sdk = { version = "0.30", features = ["rt-tokio", "rt-tokio-current-thread"] } +opentelemetry = { version = "0.31", features = ["trace"] } +opentelemetry-otlp = { version = "0.31", features = ["grpc-tonic"] } +opentelemetry_sdk = { version = "0.31", features = ["rt-tokio", "rt-tokio-current-thread"] } tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } tracing = { workspace = true } -tracing-opentelemetry = { version = "0.31", features = ["default"] } +tracing-opentelemetry = { version = "0.32", features = ["default"] } tracing-subscriber = { version = "0.3", features = ["json"] } diff --git a/instrumented-object-store/Cargo.toml b/instrumented-object-store/Cargo.toml index 4e4c55f..1f323a8 100644 --- a/instrumented-object-store/Cargo.toml +++ b/instrumented-object-store/Cargo.toml @@ -36,7 +36,7 @@ homepage = "https://github.com/datafusion-contrib/datafusion-tracing" async-trait = "0.1" bytes = "1.10" futures = { workspace = true } -object_store = { version = "0.12.3", default-features = false } +object_store = { version = "0.12.4", default-features = false } tracing = { workspace = true } tracing-futures = { workspace = true } diff --git a/integration-utils/Cargo.toml b/integration-utils/Cargo.toml index 61a49fd..f7f34cd 100644 --- a/integration-utils/Cargo.toml +++ b/integration-utils/Cargo.toml @@ -34,6 +34,6 @@ workspace = true datafusion = { workspace = true, features = ["parquet", "nested_expressions"] } datafusion-tracing = { workspace = true } instrumented-object-store = { workspace = true } -object_store = { version = "0.12.1", default-features = false } +object_store = { version = "0.12.4", default-features = false } tracing = { workspace = true } url = { version = "2.5" }