diff --git a/Cargo.lock b/Cargo.lock index 44fceba..79de9df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1358,6 +1358,17 @@ dependencies = [ "syn", ] +[[package]] +name = "dashmap" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8858831f7781322e539ea39e72449c46b059638250c14344fec8d0aa6e539c" +dependencies = [ + "cfg-if", + "num_cpus", + "parking_lot", +] + [[package]] name = "datadriven" version = "0.6.0" @@ -3525,7 +3536,7 @@ dependencies = [ "mz-orchestrator", "mz-ore", "mz-repr", - "opentelemetry", + "opentelemetry 0.17.0", "tracing-subscriber", ] @@ -3550,7 +3561,7 @@ dependencies = [ "native-tls", "once_cell", "openssl", - "opentelemetry", + "opentelemetry 0.17.0", "opentelemetry-otlp", "paste", "pin-project", @@ -4438,9 +4449,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.12.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" +checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" [[package]] name = "oorandom" @@ -4523,6 +4534,16 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "opentelemetry" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +dependencies = [ + "opentelemetry_api", + "opentelemetry_sdk", +] + [[package]] name = "opentelemetry-otlp" version = "0.10.0" @@ -4532,7 +4553,7 @@ dependencies = [ "futures", "futures-util", "http", - "opentelemetry", + "opentelemetry 0.17.0", "prost", "thiserror", "tokio", @@ -4540,6 +4561,42 @@ dependencies = [ "tonic-build", ] +[[package]] +name = "opentelemetry_api" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +dependencies = [ + "fnv", + "futures-channel", + "futures-util", + "indexmap", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +dependencies = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api", + "percent-encoding", + "rand", + "thiserror", +] + [[package]] name = "ordered-float" version = "2.10.0" @@ -6434,9 +6491,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.27" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709595b8878a4965ce5e87ebf880a7d39c9afc6837721b21a5a816a8117d921" +checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" dependencies = [ "once_cell", "valuable", @@ -6454,9 +6511,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ "lazy_static", "log", @@ -6465,12 +6522,12 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.17.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93600c803bb15e2a32bd376001b8625587f268fe887669b5ac86af524637c242" +checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" dependencies = [ "once_cell", - "opentelemetry", + "opentelemetry 0.18.0", "tracing", "tracing-core", "tracing-log", diff --git a/src/ore/Cargo.toml b/src/ore/Cargo.toml index a898dd7..ade915c 100644 --- a/src/ore/Cargo.toml +++ b/src/ore/Cargo.toml @@ -47,7 +47,7 @@ ansi_term = { version = "0.12.1", optional = true } atty = { version = "0.2.14", optional = true } http = { version = "0.2.8", optional = true } tracing = { version = "0.1.35", optional = true } -tracing-opentelemetry = { version = "0.17", optional = true } +tracing-opentelemetry = { version = "0.18", optional = true } tonic = { version = "0.7.2", features = ["transport"], optional = true } tokio-native-tls = { version = "0.3.0", optional = true } native-tls = { version = "0.2.10", features = ["alpn"], optional = true }