From 5f7faba2ac845365122c0421926220a015cb2120 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 08:50:56 +0000 Subject: [PATCH] build(deps): bump the opentelemetry group with 8 updates Bumps the opentelemetry group with 8 updates: | Package | From | To | | --- | --- | --- | | [tracing-opentelemetry](https://github.com/tokio-rs/tracing-opentelemetry) | `0.21.0` | `0.22.0` | | [opentelemetry-http](https://github.com/open-telemetry/opentelemetry-rust) | `0.9.0` | `0.10.0` | | [opentelemetry-jaeger](https://github.com/open-telemetry/opentelemetry-rust) | `0.19.0` | `0.20.0` | | [opentelemetry-otlp](https://github.com/open-telemetry/opentelemetry-rust) | `0.13.0` | `0.14.0` | | [opentelemetry-prometheus](https://github.com/open-telemetry/opentelemetry-rust) | `0.13.0` | `0.14.0` | | [opentelemetry-semantic-conventions](https://github.com/open-telemetry/opentelemetry-rust) | `0.12.0` | `0.13.0` | | [opentelemetry-stdout](https://github.com/open-telemetry/opentelemetry-rust) | `0.1.0` | `0.2.0` | | [opentelemetry-zipkin](https://github.com/open-telemetry/opentelemetry-rust) | `0.18.0` | `0.19.0` | 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-http` from 0.9.0 to 0.10.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/v0.9.0...v0.10.0) Updates `opentelemetry-jaeger` from 0.19.0 to 0.20.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/v0.19.0...v0.20.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-prometheus` 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-stdout` from 0.1.0 to 0.2.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-rust/blob/v0.2.0/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/commits/v0.2.0) Updates `opentelemetry-zipkin` from 0.18.0 to 0.19.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/v0.18.0...v0.19.0) --- updated-dependencies: - dependency-name: tracing-opentelemetry dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry - dependency-name: opentelemetry-http dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry - dependency-name: opentelemetry-jaeger 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-prometheus 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-stdout dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry - dependency-name: opentelemetry-zipkin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry ... Signed-off-by: dependabot[bot] --- Cargo.lock | 166 +++++++++++++++++++++++++++---------- crates/cli/Cargo.toml | 16 ++-- crates/handlers/Cargo.toml | 2 +- crates/http/Cargo.toml | 2 +- crates/storage/Cargo.toml | 2 +- crates/tasks/Cargo.toml | 2 +- crates/tower/Cargo.toml | 6 +- 7 files changed, 137 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1741d9d09..eee833185 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1932,6 +1932,12 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + [[package]] name = "gloo-timers" version = "0.2.6" @@ -2819,7 +2825,7 @@ dependencies = [ "mas-templates", "mas-tower", "oauth2-types", - "opentelemetry", + "opentelemetry 0.20.0", "opentelemetry-http", "opentelemetry-jaeger", "opentelemetry-otlp", @@ -2966,7 +2972,7 @@ dependencies = [ "mas-templates", "mime", "oauth2-types", - "opentelemetry", + "opentelemetry 0.20.0", "opentelemetry-semantic-conventions", "pbkdf2", "psl", @@ -3005,7 +3011,7 @@ dependencies = [ "hyper-rustls", "mas-tower", "once_cell", - "opentelemetry", + "opentelemetry 0.20.0", "rustls", "rustls-native-certs", "serde", @@ -3280,7 +3286,7 @@ dependencies = [ "mas-iana", "mas-jose", "oauth2-types", - "opentelemetry", + "opentelemetry 0.20.0", "rand_core 0.6.4", "serde", "serde_json", @@ -3337,7 +3343,7 @@ dependencies = [ "mas-storage-pg", "mas-templates", "mas-tower", - "opentelemetry", + "opentelemetry 0.20.0", "rand 0.8.5", "rand_chacha 0.3.1", "serde", @@ -3385,7 +3391,7 @@ name = "mas-tower" version = "0.5.0" dependencies = [ "http", - "opentelemetry", + "opentelemetry 0.20.0", "opentelemetry-http", "opentelemetry-semantic-conventions", "pin-project-lite", @@ -3698,53 +3704,70 @@ 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.1.0", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", ] [[package]] name = "opentelemetry-http" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" +checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" dependencies = [ "async-trait", "bytes", "http", "hyper", - "opentelemetry_api", + "opentelemetry 0.21.0", "tokio", ] [[package]] name = "opentelemetry-jaeger" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876958ba9084f390f913fcf04ddf7bbbb822898867bb0a51cc28f2b9e5c1b515" +checksum = "e617c66fd588e40e0dbbd66932fdc87393095b125d4459b1a3a10feb1712f8a1" dependencies = [ "async-trait", "futures-core", "futures-util", "http", - "opentelemetry", + "opentelemetry 0.21.0", "opentelemetry-http", "opentelemetry-semantic-conventions", + "opentelemetry_sdk 0.21.0", "thrift", "tokio", ] [[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.0", "prost", "thiserror", "tokio", @@ -3753,66 +3776,68 @@ dependencies = [ [[package]] name = "opentelemetry-prometheus" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d81bc254e2d572120363a2b16cdb0d715d301b5789be0cfc26ad87e4e10e53" +checksum = "6cd37c9261414d49ed7bd7689ffdf77a01c8c95bc29c35dfc8c7435713149baa" dependencies = [ "once_cell", - "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry 0.21.0", + "opentelemetry_sdk 0.21.0", "prometheus", "protobuf", ] [[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.0", "prost", "tonic", ] [[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]] name = "opentelemetry-stdout" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd550321bc0f9d3f6dcbfe5c75262789de5b3e2776da2cbcfd2392aa05db0c6" +checksum = "c13b2df4cd59c176099ac82806725ba340c8fa7b1a7004c0912daad30470f63e" dependencies = [ "async-trait", + "chrono", "futures-util", - "opentelemetry_api", - "opentelemetry_sdk", - "ordered-float 3.9.2", + "opentelemetry 0.21.0", + "opentelemetry_sdk 0.21.0", + "ordered-float 4.1.1", "serde", "serde_json", ] [[package]] name = "opentelemetry-zipkin" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb966f01235207a6933c0aec98374fe9782df1c1d2b3d1db35c458451d138143" +checksum = "9c2bee3ec1be4d0088378e0eb1dd54c113cbd7ec5622cc4f26181debf1d4d7b5" dependencies = [ "async-trait", "futures-core", "http", "once_cell", - "opentelemetry", + "opentelemetry 0.21.0", "opentelemetry-http", "opentelemetry-semantic-conventions", + "opentelemetry_sdk 0.21.0", "serde", "serde_json", "thiserror", @@ -3852,7 +3877,28 @@ dependencies = [ "percent-encoding", "rand 0.8.5", "regex", - "serde_json", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5b3ce3f5705e2ae493be467a0b23be4bc563c193cdb7713e55372c89a906b34" +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 0.8.5", "thiserror", "tokio", "tokio-stream", @@ -3876,6 +3922,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 = "os_info" version = "3.7.0" @@ -6077,19 +6132,32 @@ dependencies = [ ] [[package]] -name = "tracing-opentelemetry" -version = "0.21.0" +name = "tracing-log" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ + "log", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry 0.21.0", + "opentelemetry_sdk 0.21.0", "smallvec", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", "tracing-subscriber", + "web-time", ] [[package]] @@ -6107,7 +6175,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.1.4", ] [[package]] @@ -6716,6 +6784,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.24.0" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 51bf2f5ea..4eac1e585 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -33,15 +33,15 @@ zeroize = "1.6.0" tracing.workspace = true tracing-appender = "0.2.2" tracing-subscriber = { workspace = true, features = ["env-filter"] } -tracing-opentelemetry = "0.21.0" +tracing-opentelemetry = "0.22.0" opentelemetry = { version = "0.20.0", features = ["trace", "metrics", "rt-tokio"] } -opentelemetry-http = { version = "0.9.0", features = ["tokio", "hyper"] } -opentelemetry-jaeger = { version = "0.19.0", features = ["rt-tokio", "collector_client"] } -opentelemetry-otlp = { version = "0.13.0", features = ["trace", "metrics"] } -opentelemetry-prometheus = "0.13.0" -opentelemetry-semantic-conventions = "0.12.0" -opentelemetry-stdout = { version = "0.1.0", features = ["trace", "metrics"] } -opentelemetry-zipkin = { version = "0.18.0", default-features = false } +opentelemetry-http = { version = "0.10.0", features = ["tokio", "hyper"] } +opentelemetry-jaeger = { version = "0.20.0", features = ["rt-tokio", "collector_client"] } +opentelemetry-otlp = { version = "0.14.0", features = ["trace", "metrics"] } +opentelemetry-prometheus = "0.14.0" +opentelemetry-semantic-conventions = "0.13.0" +opentelemetry-stdout = { version = "0.2.0", features = ["trace", "metrics"] } +opentelemetry-zipkin = { version = "0.19.0", default-features = false } prometheus = "0.13.3" sentry = { version = "0.31.7", default-features = false, features = ["backtrace", "contexts", "panic", "tower"] } sentry-tracing = "0.31.7" diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml index e67b78a97..635f4ce21 100644 --- a/crates/handlers/Cargo.toml +++ b/crates/handlers/Cargo.toml @@ -15,7 +15,7 @@ futures-util = "0.3.28" # Logging and tracing tracing.workspace = true opentelemetry = "0.20.0" -opentelemetry-semantic-conventions = "0.12.0" +opentelemetry-semantic-conventions = "0.13.0" # Error management thiserror.workspace = true diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml index fcfa347bd..302855f0d 100644 --- a/crates/http/Cargo.toml +++ b/crates/http/Cargo.toml @@ -28,7 +28,7 @@ tokio = { version = "1.33.0", features = ["sync", "parking_lot"], optional = tru tower = { version = "0.4.13", features = [] } tower-http = { version = "0.4.4", features = ["cors"] } tracing.workspace = true -tracing-opentelemetry = "0.21.0" +tracing-opentelemetry = "0.22.0" webpki-roots = { version = "0.25.2", optional = true } mas-tower = { path = "../tower" } diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index b8562a4c4..af75337e5 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -19,7 +19,7 @@ rand_core = "0.6.4" serde.workspace = true serde_json.workspace = true tracing.workspace = true -tracing-opentelemetry = "0.21.0" +tracing-opentelemetry = "0.22.0" url.workspace = true ulid.workspace = true diff --git a/crates/tasks/Cargo.toml b/crates/tasks/Cargo.toml index dc5333a4a..6680412d5 100644 --- a/crates/tasks/Cargo.toml +++ b/crates/tasks/Cargo.toml @@ -23,7 +23,7 @@ thiserror.workspace = true tokio = { version = "1.33.0", features = ["rt"] } tower = "0.4.13" tracing.workspace = true -tracing-opentelemetry = "0.21.0" +tracing-opentelemetry = "0.22.0" opentelemetry = "0.20.0" ulid.workspace = true url.workspace = true diff --git a/crates/tower/Cargo.toml b/crates/tower/Cargo.toml index af731c6b4..66b5abb24 100644 --- a/crates/tower/Cargo.toml +++ b/crates/tower/Cargo.toml @@ -10,10 +10,10 @@ repository.workspace = true [dependencies] http.workspace = true tracing.workspace = true -tracing-opentelemetry = "0.21.0" +tracing-opentelemetry = "0.22.0" tower = "0.4.13" tokio = { version = "1.33.0", features = ["time"] } opentelemetry = { version = "0.20.0", features = ["metrics"] } -opentelemetry-http = "0.9.0" -opentelemetry-semantic-conventions = "0.12.0" +opentelemetry-http = "0.10.0" +opentelemetry-semantic-conventions = "0.13.0" pin-project-lite = "0.2.13" \ No newline at end of file