From bcbbe2dc229a234611c9dc39f5830e754d3fb330 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 13:42:38 +0000 Subject: [PATCH 1/9] chore(deps): Bump the opentelemetry group with 4 updates Bumps the opentelemetry group with 4 updates: [tracing-opentelemetry](https://github.com/tokio-rs/tracing-opentelemetry), [opentelemetry-otlp](https://github.com/open-telemetry/opentelemetry-rust), [opentelemetry-semantic-conventions](https://github.com/open-telemetry/opentelemetry-rust) and [opentelemetry_sdk](https://github.com/open-telemetry/opentelemetry-rust). Updates `tracing-opentelemetry` from 0.21.0 to 0.22.0 - [Release notes](https://github.com/tokio-rs/tracing-opentelemetry/releases) - [Changelog](https://github.com/tokio-rs/tracing-opentelemetry/blob/v0.1.x/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/tracing-opentelemetry/compare/v0.21.0...v0.22.0) Updates `opentelemetry-otlp` from 0.13.0 to 0.14.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/v0.13.0...v0.14.0) Updates `opentelemetry-semantic-conventions` from 0.12.0 to 0.13.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/v0.12.0...v0.13.0) Updates `opentelemetry_sdk` from 0.20.0 to 0.21.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/v0.20.0...v0.21.1) --- updated-dependencies: - dependency-name: tracing-opentelemetry dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry - dependency-name: opentelemetry-otlp dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry - dependency-name: opentelemetry-semantic-conventions dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry - dependency-name: opentelemetry_sdk dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry ... Signed-off-by: dependabot[bot] --- Cargo.lock | 115 +++++++++++++++++++++++++++------- src/common/Cargo.toml | 2 +- src/utils/runtime/Cargo.toml | 6 +- src/workspace-hack/Cargo.toml | 2 +- 4 files changed, 96 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 386b2ee98206b..f72d667d4c459 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5627,22 +5627,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" dependencies = [ "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry_sdk 0.20.0", +] + +[[package]] +name = "opentelemetry" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" +dependencies = [ + "futures-core", + "futures-sink", + "indexmap 2.0.0", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", ] [[package]] name = "opentelemetry-otlp" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275" +checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" dependencies = [ "async-trait", "futures-core", "http", + "opentelemetry 0.21.0", "opentelemetry-proto", "opentelemetry-semantic-conventions", - "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry_sdk 0.21.1", "prost 0.11.9", "thiserror", "tokio", @@ -5651,23 +5667,23 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb" +checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry 0.21.0", + "opentelemetry_sdk 0.21.1", "prost 0.11.9", "tonic 0.9.2", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269" +checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" dependencies = [ - "opentelemetry", + "opentelemetry 0.21.0", ] [[package]] @@ -5702,13 +5718,32 @@ dependencies = [ "ordered-float 3.9.1", "percent-encoding", "rand", - "regex", - "serde_json", "thiserror", "tokio", "tokio-stream", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "968ba3f2ca03e90e5187f5e4f46c791ef7f2c163ae87789c8ce5f5ca3b7b7de5" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry 0.21.0", + "ordered-float 4.1.1", + "percent-encoding", + "rand", + "serde_json", + "thiserror", +] + [[package]] name = "ordered-float" version = "2.10.0" @@ -5727,6 +5762,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "ordered-float" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" +dependencies = [ + "num-traits", +] + [[package]] name = "ordered-multimap" version = "0.7.1" @@ -7332,7 +7376,7 @@ dependencies = [ "libc", "madsim-tokio", "nix 0.27.1", - "opentelemetry", + "opentelemetry 0.20.0", "parking_lot 0.12.1", "prometheus", "rand", @@ -7452,7 +7496,7 @@ dependencies = [ "num-integer", "num-traits", "number_prefix", - "opentelemetry", + "opentelemetry 0.20.0", "parking_lot 0.12.1", "parse-display", "paste", @@ -8326,7 +8370,7 @@ dependencies = [ "futures", "hostname", "madsim-tokio", - "opentelemetry", + "opentelemetry 0.20.0", "opentelemetry-otlp", "opentelemetry-semantic-conventions", "parking_lot 0.12.1", @@ -10757,20 +10801,33 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + [[package]] name = "tracing-opentelemetry" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" +checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" dependencies = [ + "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.21.0", + "opentelemetry_sdk 0.21.1", "smallvec", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", "tracing-subscriber", + "web-time", ] [[package]] @@ -10802,7 +10859,7 @@ dependencies = [ "time", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.1.3", "tracing-serde", ] @@ -11193,6 +11250,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "webpki-roots" version = "0.23.1" @@ -11506,7 +11573,7 @@ dependencies = [ "num-iter", "num-traits", "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry_sdk 0.21.1", "ordered-float 3.9.1", "parking_lot 0.12.1", "parking_lot_core 0.9.8", diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml index 921c02ee6ae4e..c93f9081050bd 100644 --- a/src/common/Cargo.toml +++ b/src/common/Cargo.toml @@ -101,7 +101,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [ toml = "0.8" tonic = { workspace = true } tracing = "0.1" -tracing-opentelemetry = "0.21" +tracing-opentelemetry = "0.22" tracing-subscriber = "0.3.17" twox-hash = "1" url = "2" diff --git a/src/utils/runtime/Cargo.toml b/src/utils/runtime/Cargo.toml index 8bd4e49d808a9..6db1e8d730194 100644 --- a/src/utils/runtime/Cargo.toml +++ b/src/utils/runtime/Cargo.toml @@ -21,8 +21,8 @@ console-subscriber = "0.2.0" either = "1" futures = { version = "0.3", default-features = false, features = ["alloc"] } hostname = "0.3" -opentelemetry-otlp = { version = "0.13" } -opentelemetry-semantic-conventions = "0.12" +opentelemetry-otlp = { version = "0.14" } +opentelemetry-semantic-conventions = "0.13" parking_lot = { version = "0.12", features = ["deadlock_detection"] } pprof = { version = "0.13", features = ["flamegraph"] } risingwave_common = { workspace = true } @@ -39,7 +39,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [ "fs" ] } tracing = "0.1" -tracing-opentelemetry = "0.21" +tracing-opentelemetry = "0.22" tracing-subscriber = { version = "0.3", features = ["fmt", "parking_lot", "std", "time", "local-time", "json"] } [target.'cfg(not(madsim))'.dependencies] diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index b263a9c5bcefb..6e51420192fb2 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -82,7 +82,7 @@ num-integer = { version = "0.1", features = ["i128"] } num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2", features = ["i128", "libm"] } opentelemetry_api = { version = "0.20", features = ["logs", "metrics"] } -opentelemetry_sdk = { version = "0.20", features = ["logs", "metrics"] } +opentelemetry_sdk = { version = "0.21", features = ["logs", "metrics"] } ordered-float = { version = "3" } parking_lot = { version = "0.12", features = ["arc_lock", "deadlock_detection"] } parking_lot_core = { version = "0.9", default-features = false, features = ["deadlock_detection"] } From 5f71ae7f9943a72f283f4100be87bb94d839e486 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 15 Nov 2023 13:43:42 +0000 Subject: [PATCH 2/9] Fix "cargo-hakari" --- Cargo.lock | 3 --- src/workspace-hack/Cargo.toml | 2 -- 2 files changed, 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f72d667d4c459..df64a770f523e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5740,7 +5740,6 @@ dependencies = [ "ordered-float 4.1.1", "percent-encoding", "rand", - "serde_json", "thiserror", ] @@ -11572,8 +11571,6 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "opentelemetry_api", - "opentelemetry_sdk 0.21.1", "ordered-float 3.9.1", "parking_lot 0.12.1", "parking_lot_core 0.9.8", diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 6e51420192fb2..f7b5d219a3365 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -81,8 +81,6 @@ num-bigint = { version = "0.4" } num-integer = { version = "0.1", features = ["i128"] } num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2", features = ["i128", "libm"] } -opentelemetry_api = { version = "0.20", features = ["logs", "metrics"] } -opentelemetry_sdk = { version = "0.21", features = ["logs", "metrics"] } ordered-float = { version = "3" } parking_lot = { version = "0.12", features = ["arc_lock", "deadlock_detection"] } parking_lot_core = { version = "0.9", default-features = false, features = ["deadlock_detection"] } From 839046914f92b2fa612e3b10b3e14a7861e9a8b6 Mon Sep 17 00:00:00 2001 From: Bugen Zhao Date: Thu, 16 Nov 2023 14:55:56 +0800 Subject: [PATCH 3/9] manual bump and fix builds Signed-off-by: Bugen Zhao --- .github/dependabot.yml | 1 + Cargo.lock | 73 +++++++-------------------------- Cargo.toml | 6 +++ src/bench/Cargo.toml | 2 +- src/common/Cargo.toml | 5 ++- src/common/src/util/tracing.rs | 2 +- src/utils/runtime/Cargo.toml | 9 ++-- src/utils/runtime/src/logger.rs | 5 ++- 8 files changed, 35 insertions(+), 68 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c4689affbb32b..d81a3cbd92fa1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,6 +26,7 @@ updates: - "prost*" opentelemetry: patterns: + - "opentelemetry" - "opentelemetry*" - "tracing-opentelemetry" mysql: diff --git a/Cargo.lock b/Cargo.lock index df64a770f523e..d5335ebb68f6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5620,16 +5620,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "opentelemetry" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" -dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk 0.20.0", -] - [[package]] name = "opentelemetry" version = "0.21.0" @@ -5655,10 +5645,10 @@ dependencies = [ "async-trait", "futures-core", "http", - "opentelemetry 0.21.0", + "opentelemetry", "opentelemetry-proto", "opentelemetry-semantic-conventions", - "opentelemetry_sdk 0.21.1", + "opentelemetry_sdk", "prost 0.11.9", "thiserror", "tokio", @@ -5671,8 +5661,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" dependencies = [ - "opentelemetry 0.21.0", - "opentelemetry_sdk 0.21.1", + "opentelemetry", + "opentelemetry_sdk", "prost 0.11.9", "tonic 0.9.2", ] @@ -5683,44 +5673,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" dependencies = [ - "opentelemetry 0.21.0", -] - -[[package]] -name = "opentelemetry_api" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" -dependencies = [ - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry_api", - "ordered-float 3.9.1", - "percent-encoding", - "rand", - "thiserror", - "tokio", - "tokio-stream", + "opentelemetry", ] [[package]] @@ -5736,11 +5689,13 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry 0.21.0", + "opentelemetry", "ordered-float 4.1.1", "percent-encoding", "rand", "thiserror", + "tokio", + "tokio-stream", ] [[package]] @@ -7375,7 +7330,7 @@ dependencies = [ "libc", "madsim-tokio", "nix 0.27.1", - "opentelemetry 0.20.0", + "opentelemetry", "parking_lot 0.12.1", "prometheus", "rand", @@ -7495,7 +7450,8 @@ dependencies = [ "num-integer", "num-traits", "number_prefix", - "opentelemetry 0.20.0", + "opentelemetry", + "opentelemetry_sdk", "parking_lot 0.12.1", "parse-display", "paste", @@ -8369,9 +8325,10 @@ dependencies = [ "futures", "hostname", "madsim-tokio", - "opentelemetry 0.20.0", + "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", + "opentelemetry_sdk", "parking_lot 0.12.1", "pprof", "risingwave_common", @@ -10819,8 +10776,8 @@ checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" dependencies = [ "js-sys", "once_cell", - "opentelemetry 0.21.0", - "opentelemetry_sdk 0.21.1", + "opentelemetry", + "opentelemetry_sdk", "smallvec", "tracing", "tracing-core", diff --git a/Cargo.toml b/Cargo.toml index e99ba6030ebb2..5bea8ddbf9ab9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -130,6 +130,12 @@ tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git" "profiling", "stats", ], rev = "64a2d9" } +opentelemetry = "0.21" +opentelemetry-otlp = "0.14" +opentelemetry_sdk = { version = "0.21", default-features = false, features = ["rt-tokio"] } +tracing-opentelemetry = "0.22" +opentelemetry-semantic-conventions = "0.13" + risingwave_backup = { path = "./src/storage/backup" } risingwave_batch = { path = "./src/batch" } diff --git a/src/bench/Cargo.toml b/src/bench/Cargo.toml index e5f6d8e7ede1a..dfd7ced027423 100644 --- a/src/bench/Cargo.toml +++ b/src/bench/Cargo.toml @@ -21,7 +21,7 @@ futures = { version = "0.3", default-features = false, features = ["alloc"] } hdrhistogram = "7" itertools = "0.12" libc = "0.2" -opentelemetry = { version = "0.20", default-features = false, features = ["rt-tokio"], optional = true } +opentelemetry = { workspace = true, optional = true } parking_lot = "0.12" prometheus = { version = "0.13", features = ["process"] } rand = "0.8" diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml index c93f9081050bd..0b8e585576e16 100644 --- a/src/common/Cargo.toml +++ b/src/common/Cargo.toml @@ -56,7 +56,8 @@ memcomparable = { version = "0.2", features = ["decimal"] } num-integer = "0.1" num-traits = "0.2" number_prefix = "0.4.0" -opentelemetry = { version = "0.20", default-features = false } +opentelemetry = { workspace = true } +opentelemetry_sdk = { workspace = true } parking_lot = "0.12" parse-display = "0.8" paste = "1" @@ -101,7 +102,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [ toml = "0.8" tonic = { workspace = true } tracing = "0.1" -tracing-opentelemetry = "0.22" +tracing-opentelemetry = { workspace = true } tracing-subscriber = "0.3.17" twox-hash = "1" url = "2" diff --git a/src/common/src/util/tracing.rs b/src/common/src/util/tracing.rs index a69954b35e21f..9ad03e1da359a 100644 --- a/src/common/src/util/tracing.rs +++ b/src/common/src/util/tracing.rs @@ -15,7 +15,7 @@ use std::collections::HashMap; use opentelemetry::propagation::TextMapPropagator; -use opentelemetry::sdk::propagation::TraceContextPropagator; +use opentelemetry_sdk::propagation::TraceContextPropagator; use tracing_opentelemetry::OpenTelemetrySpanExt; /// Context for tracing used for propagating tracing information in a distributed system. diff --git a/src/utils/runtime/Cargo.toml b/src/utils/runtime/Cargo.toml index 6db1e8d730194..2aaac99f18248 100644 --- a/src/utils/runtime/Cargo.toml +++ b/src/utils/runtime/Cargo.toml @@ -21,8 +21,9 @@ console-subscriber = "0.2.0" either = "1" futures = { version = "0.3", default-features = false, features = ["alloc"] } hostname = "0.3" -opentelemetry-otlp = { version = "0.14" } -opentelemetry-semantic-conventions = "0.13" +opentelemetry-otlp = { workspace = true } +opentelemetry-semantic-conventions = { workspace = true } +opentelemetry_sdk = { workspace = true } parking_lot = { version = "0.12", features = ["deadlock_detection"] } pprof = { version = "0.13", features = ["flamegraph"] } risingwave_common = { workspace = true } @@ -39,11 +40,11 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [ "fs" ] } tracing = "0.1" -tracing-opentelemetry = "0.22" +tracing-opentelemetry = { workspace = true } tracing-subscriber = { version = "0.3", features = ["fmt", "parking_lot", "std", "time", "local-time", "json"] } [target.'cfg(not(madsim))'.dependencies] -opentelemetry = { version = "0.20", default-features = false, features = ["rt-tokio"] } +opentelemetry = { workspace = true } workspace-hack = { path = "../../workspace-hack" } [lints] diff --git a/src/utils/runtime/src/logger.rs b/src/utils/runtime/src/logger.rs index c4fe90c294081..d7f3ab81ef593 100644 --- a/src/utils/runtime/src/logger.rs +++ b/src/utils/runtime/src/logger.rs @@ -316,8 +316,9 @@ pub fn init_risingwave_logger(settings: LoggerSettings) { if let Ok(endpoint) = std::env::var("RW_TRACING_ENDPOINT") { println!("tracing enabled, exported to `{endpoint}`"); - use opentelemetry::{sdk, KeyValue}; + use opentelemetry::KeyValue; use opentelemetry_otlp::WithExportConfig; + use opentelemetry_sdk as sdk; use opentelemetry_semantic_conventions::resource; let id = format!( @@ -359,7 +360,7 @@ pub fn init_risingwave_logger(settings: LoggerSettings) { KeyValue::new(resource::SERVICE_VERSION, env!("CARGO_PKG_VERSION")), KeyValue::new(resource::PROCESS_PID, std::process::id().to_string()), ]))) - .install_batch(opentelemetry::runtime::Tokio) + .install_batch(sdk::runtime::Tokio) .unwrap() }; From bc97af43ceffacf896a5831b02753196dde20dc8 Mon Sep 17 00:00:00 2001 From: Bugen Zhao Date: Thu, 16 Nov 2023 14:56:28 +0800 Subject: [PATCH 4/9] fix toml Signed-off-by: Bugen Zhao --- Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 5bea8ddbf9ab9..69a612d07dba0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -136,7 +136,6 @@ opentelemetry_sdk = { version = "0.21", default-features = false, features = ["r tracing-opentelemetry = "0.22" opentelemetry-semantic-conventions = "0.13" - risingwave_backup = { path = "./src/storage/backup" } risingwave_batch = { path = "./src/batch" } risingwave_cmd = { path = "./src/cmd" } From 6b4fbc0058c3729b0221c49283f4668b3167c7cf Mon Sep 17 00:00:00 2001 From: Bugen Zhao Date: Thu, 16 Nov 2023 15:02:39 +0800 Subject: [PATCH 5/9] make all otel dependencies for runtime as optional Signed-off-by: Bugen Zhao --- src/utils/runtime/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/runtime/Cargo.toml b/src/utils/runtime/Cargo.toml index 2aaac99f18248..4d25320e18e2d 100644 --- a/src/utils/runtime/Cargo.toml +++ b/src/utils/runtime/Cargo.toml @@ -21,9 +21,6 @@ console-subscriber = "0.2.0" either = "1" futures = { version = "0.3", default-features = false, features = ["alloc"] } hostname = "0.3" -opentelemetry-otlp = { workspace = true } -opentelemetry-semantic-conventions = { workspace = true } -opentelemetry_sdk = { workspace = true } parking_lot = { version = "0.12", features = ["deadlock_detection"] } pprof = { version = "0.13", features = ["flamegraph"] } risingwave_common = { workspace = true } @@ -45,6 +42,9 @@ tracing-subscriber = { version = "0.3", features = ["fmt", "parking_lot", "std", [target.'cfg(not(madsim))'.dependencies] opentelemetry = { workspace = true } +opentelemetry-otlp = { workspace = true } +opentelemetry-semantic-conventions = { workspace = true } +opentelemetry_sdk = { workspace = true } workspace-hack = { path = "../../workspace-hack" } [lints] From 7c7dba55d519f3f22832456ba8e481f8cd185da8 Mon Sep 17 00:00:00 2001 From: BugenZhao Date: Thu, 16 Nov 2023 07:03:42 +0000 Subject: [PATCH 6/9] Fix "cargo-hakari" --- Cargo.lock | 3 +-- src/workspace-hack/Cargo.toml | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d5335ebb68f6b..36fb88d0e834a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11537,7 +11537,6 @@ dependencies = [ "postgres-types", "proc-macro2", "prometheus", - "prost 0.11.9", "prost 0.12.1", "prost-types 0.12.1", "quote", @@ -11576,12 +11575,12 @@ dependencies = [ "tinyvec", "tokio", "tokio-postgres", + "tokio-rustls", "tokio-stream", "tokio-util", "toml_datetime", "toml_edit 0.19.15", "tonic 0.10.2", - "tonic 0.9.2", "tower", "tracing", "tracing-core", diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index f7b5d219a3365..5060a77af7694 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -90,8 +90,7 @@ phf_shared = { version = "0.11", features = ["uncased"] } postgres-types = { version = "0.2", default-features = false, features = ["derive", "with-chrono-0_4", "with-serde_json-1"] } proc-macro2 = { version = "1", features = ["span-locations"] } prometheus = { version = "0.13", features = ["process"] } -prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["no-recursion-limit"] } -prost-a6292c17cd707f01 = { package = "prost", version = "0.11" } +prost = { version = "0.12", features = ["no-recursion-limit"] } prost-types = { version = "0.12" } quote = { version = "1" } rand = { version = "0.8", features = ["small_rng"] } @@ -127,12 +126,12 @@ time = { version = "0.3", features = ["local-offset", "macros", "serde-well-know tinyvec = { version = "1", features = ["alloc", "grab_spare_slice", "rustc_1_55"] } tokio = { version = "1", features = ["full", "stats", "tracing"] } tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "ac00d88", features = ["with-chrono-0_4"] } +tokio-rustls = { version = "0.24" } tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e", features = ["fs", "net"] } tokio-util = { version = "0.7", features = ["codec", "io"] } toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } toml_edit = { version = "0.19", features = ["serde"] } -tonic-274715c4dabd11b0 = { package = "tonic", version = "0.9", features = ["gzip", "tls-webpki-roots"] } -tonic-93f6ce9d446188ac = { package = "tonic", version = "0.10" } +tonic = { version = "0.10" } tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "timeout", "util"] } tracing = { version = "0.1", features = ["log"] } tracing-core = { version = "0.1" } @@ -169,8 +168,7 @@ petgraph = { version = "0.6" } phf = { version = "0.11", features = ["uncased"] } phf_shared = { version = "0.11", features = ["uncased"] } proc-macro2 = { version = "1", features = ["span-locations"] } -prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["no-recursion-limit"] } -prost-a6292c17cd707f01 = { package = "prost", version = "0.11" } +prost = { version = "0.12", features = ["no-recursion-limit"] } prost-types = { version = "0.12" } quote = { version = "1" } rand = { version = "0.8", features = ["small_rng"] } From 14a7d8e07f87c7e1b1465d744896049cc0788096 Mon Sep 17 00:00:00 2001 From: BugenZhao Date: Sun, 18 Feb 2024 09:08:54 +0000 Subject: [PATCH 7/9] Fix "cargo-hakari" --- Cargo.lock | 29 +++++++++++++++-------------- src/workspace-hack/Cargo.toml | 5 +++-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 64697fb44643c..ec284f3ba4778 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6800,7 +6800,7 @@ checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" dependencies = [ "async-trait", "futures-core", - "http", + "http 0.2.9", "opentelemetry", "opentelemetry-proto", "opentelemetry-semantic-conventions", @@ -12918,18 +12918,8 @@ dependencies = [ ] [[package]] -name = "web-time" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" +name = "wasmprinter" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d027eb8294904fc715ac0870cebe6b0271e96b90605ee21511e7565c4ce568c" dependencies = [ @@ -13319,6 +13309,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "webpki-roots" version = "0.25.2" @@ -13816,6 +13816,8 @@ dependencies = [ "num-integer", "num-iter", "num-traits", + "openssl", + "openssl-sys", "ordered-float 3.9.1", "parking_lot 0.12.1", "parking_lot_core 0.9.8", @@ -13864,7 +13866,6 @@ dependencies = [ "tinyvec", "tokio", "tokio-postgres", - "tokio-rustls", "tokio-stream", "tokio-util", "toml_datetime", diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 95f1dbb10672e..690fed8acc47a 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -88,6 +88,8 @@ num-bigint = { version = "0.4" } num-integer = { version = "0.1", features = ["i128"] } num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2", features = ["i128", "libm"] } +openssl = { version = "0.10", features = ["vendored"] } +openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] } ordered-float = { version = "3" } parking_lot = { version = "0.12", features = ["arc_lock", "deadlock_detection"] } parking_lot_core = { version = "0.9", default-features = false, features = ["deadlock_detection"] } @@ -134,12 +136,11 @@ time = { version = "0.3", features = ["local-offset", "macros", "serde-well-know tinyvec = { version = "1", features = ["alloc", "grab_spare_slice", "rustc_1_55"] } tokio = { version = "1", features = ["full", "stats", "tracing"] } tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "ac00d88", features = ["with-chrono-0_4"] } -tokio-rustls = { version = "0.24" } tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e", features = ["fs", "net"] } tokio-util = { version = "0.7", features = ["codec", "io"] } toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } toml_edit = { version = "0.19", features = ["serde"] } -tonic = { version = "0.10" } +tonic = { version = "0.10", features = ["gzip", "tls-webpki-roots"] } tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "timeout", "util"] } tracing = { version = "0.1", features = ["log"] } tracing-core = { version = "0.1" } From 62b78b6008fcc864218b65709b784295dcc2efcc Mon Sep 17 00:00:00 2001 From: Bugen Zhao Date: Sun, 18 Feb 2024 17:09:42 +0800 Subject: [PATCH 8/9] update hakari and cargo.lock Signed-off-by: Bugen Zhao --- Cargo.lock | 29 +++++++++++++++-------------- src/workspace-hack/Cargo.toml | 5 +++-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 64697fb44643c..ec284f3ba4778 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6800,7 +6800,7 @@ checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" dependencies = [ "async-trait", "futures-core", - "http", + "http 0.2.9", "opentelemetry", "opentelemetry-proto", "opentelemetry-semantic-conventions", @@ -12918,18 +12918,8 @@ dependencies = [ ] [[package]] -name = "web-time" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" +name = "wasmprinter" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d027eb8294904fc715ac0870cebe6b0271e96b90605ee21511e7565c4ce568c" dependencies = [ @@ -13319,6 +13309,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "webpki-roots" version = "0.25.2" @@ -13816,6 +13816,8 @@ dependencies = [ "num-integer", "num-iter", "num-traits", + "openssl", + "openssl-sys", "ordered-float 3.9.1", "parking_lot 0.12.1", "parking_lot_core 0.9.8", @@ -13864,7 +13866,6 @@ dependencies = [ "tinyvec", "tokio", "tokio-postgres", - "tokio-rustls", "tokio-stream", "tokio-util", "toml_datetime", diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 95f1dbb10672e..690fed8acc47a 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -88,6 +88,8 @@ num-bigint = { version = "0.4" } num-integer = { version = "0.1", features = ["i128"] } num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] } num-traits = { version = "0.2", features = ["i128", "libm"] } +openssl = { version = "0.10", features = ["vendored"] } +openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] } ordered-float = { version = "3" } parking_lot = { version = "0.12", features = ["arc_lock", "deadlock_detection"] } parking_lot_core = { version = "0.9", default-features = false, features = ["deadlock_detection"] } @@ -134,12 +136,11 @@ time = { version = "0.3", features = ["local-offset", "macros", "serde-well-know tinyvec = { version = "1", features = ["alloc", "grab_spare_slice", "rustc_1_55"] } tokio = { version = "1", features = ["full", "stats", "tracing"] } tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "ac00d88", features = ["with-chrono-0_4"] } -tokio-rustls = { version = "0.24" } tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e", features = ["fs", "net"] } tokio-util = { version = "0.7", features = ["codec", "io"] } toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } toml_edit = { version = "0.19", features = ["serde"] } -tonic = { version = "0.10" } +tonic = { version = "0.10", features = ["gzip", "tls-webpki-roots"] } tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "timeout", "util"] } tracing = { version = "0.1", features = ["log"] } tracing-core = { version = "0.1" } From 9ae3a7b7befb5c908953a14846243557f3b18570 Mon Sep 17 00:00:00 2001 From: Bugen Zhao Date: Sun, 18 Feb 2024 17:17:30 +0800 Subject: [PATCH 9/9] only enable `rt-tokio` feature under non-madsim target Signed-off-by: Bugen Zhao --- Cargo.toml | 2 +- src/utils/runtime/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 056603e0529e1..681c867b6dcd2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -155,7 +155,7 @@ tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git" ], rev = "64a2d9" } opentelemetry = "0.21" opentelemetry-otlp = "0.14" -opentelemetry_sdk = { version = "0.21", default-features = false, features = ["rt-tokio"] } +opentelemetry_sdk = { version = "0.21", default-features = false } opentelemetry-semantic-conventions = "0.13" tokio-util = "0.7" tracing-opentelemetry = "0.22" diff --git a/src/utils/runtime/Cargo.toml b/src/utils/runtime/Cargo.toml index d2a2c7274c5fa..1f4e085632eae 100644 --- a/src/utils/runtime/Cargo.toml +++ b/src/utils/runtime/Cargo.toml @@ -45,7 +45,7 @@ tracing-subscriber = { version = "0.3", features = ["fmt", "parking_lot", "std", opentelemetry = { workspace = true } opentelemetry-otlp = { workspace = true } opentelemetry-semantic-conventions = { workspace = true } -opentelemetry_sdk = { workspace = true } +opentelemetry_sdk = { workspace = true, features = ["rt-tokio"] } # only enable `rt-tokio` feature under non-madsim target workspace-hack = { path = "../../workspace-hack" } [lints]