From 73dade361316827cbd630a609089fe7132c6327d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 14:32:46 +0000 Subject: [PATCH 1/4] build(deps): bump tracing-opentelemetry from 0.22.0 to 0.23.0 Bumps [tracing-opentelemetry](https://github.com/tokio-rs/tracing-opentelemetry) from 0.22.0 to 0.23.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.22.0...v0.23.0) --- updated-dependencies: - dependency-name: tracing-opentelemetry dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 63 ++++++++++++++++++++++++++++++++++++++++++------------ Cargo.toml | 2 +- 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0b7f0851..10915599 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3260,6 +3260,21 @@ dependencies = [ "urlencoding", ] +[[package]] +name = "opentelemetry" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", +] + [[package]] name = "opentelemetry-otlp" version = "0.14.0" @@ -3269,10 +3284,10 @@ dependencies = [ "async-trait", "futures-core", "http 0.2.12", - "opentelemetry", + "opentelemetry 0.21.0", "opentelemetry-proto", "opentelemetry-semantic-conventions", - "opentelemetry_sdk", + "opentelemetry_sdk 0.21.2", "prost 0.11.9", "thiserror", "tokio", @@ -3285,8 +3300,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.21.0", + "opentelemetry_sdk 0.21.2", "prost 0.11.9", "tonic", ] @@ -3297,7 +3312,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" dependencies = [ - "opentelemetry", + "opentelemetry 0.21.0", ] [[package]] @@ -3313,7 +3328,7 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.21.0", "ordered-float 4.2.0", "percent-encoding", "rand", @@ -3322,6 +3337,26 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry 0.22.0", + "ordered-float 4.2.0", + "percent-encoding", + "rand", + "thiserror", +] + [[package]] name = "option-ext" version = "0.2.0" @@ -3853,9 +3888,9 @@ dependencies = [ "mockall", "mockall_double", "num_cpus", - "opentelemetry", + "opentelemetry 0.21.0", "opentelemetry-otlp", - "opentelemetry_sdk", + "opentelemetry_sdk 0.21.2", "policy-evaluator", "pprof", "procfs", @@ -5527,14 +5562,14 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" +checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" dependencies = [ "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.22.0", + "opentelemetry_sdk 0.22.1", "smallvec", "tracing", "tracing-core", @@ -6350,9 +6385,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index c706ae5d..30f30d09 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ thiserror = "1.0" tokio = { version = "^1.36.0", features = ["full"] } tracing = "0.1" tracing-futures = "0.2" -tracing-opentelemetry = "0.22.0" +tracing-opentelemetry = "0.23.0" tracing-subscriber = { version = "0.3", features = ["ansi", "fmt", "json"] } semver = { version = "1.0.22", features = ["serde"] } mockall_double = "0.3" From 8456814e79554637c7ccfe981a665fef2fca40f9 Mon Sep 17 00:00:00 2001 From: Fabrizio Sestito Date: Fri, 15 Mar 2024 12:37:44 +0100 Subject: [PATCH 2/4] build(deps): bump opentelemetry dependencies Signed-off-by: Fabrizio Sestito --- Cargo.lock | 119 +++++++++++++---------------------------------------- Cargo.toml | 6 +-- 2 files changed, 31 insertions(+), 94 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 10915599..a39c2378 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3244,22 +3244,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[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.2.5", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - [[package]] name = "opentelemetry" version = "0.22.0" @@ -3277,18 +3261,18 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" +checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb" dependencies = [ "async-trait", "futures-core", "http 0.2.12", - "opentelemetry 0.21.0", + "opentelemetry", "opentelemetry-proto", "opentelemetry-semantic-conventions", - "opentelemetry_sdk 0.21.2", - "prost 0.11.9", + "opentelemetry_sdk", + "prost", "thiserror", "tokio", "tonic", @@ -3296,46 +3280,21 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" +checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4" dependencies = [ - "opentelemetry 0.21.0", - "opentelemetry_sdk 0.21.2", - "prost 0.11.9", + "opentelemetry", + "opentelemetry_sdk", + "prost", "tonic", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" -dependencies = [ - "opentelemetry 0.21.0", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.21.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "glob", - "once_cell", - "opentelemetry 0.21.0", - "ordered-float 4.2.0", - "percent-encoding", - "rand", - "thiserror", - "tokio", - "tokio-stream", -] +checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910" [[package]] name = "opentelemetry_sdk" @@ -3350,11 +3309,13 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry 0.22.0", + "opentelemetry", "ordered-float 4.2.0", "percent-encoding", "rand", "thiserror", + "tokio", + "tokio-stream", ] [[package]] @@ -3888,9 +3849,9 @@ dependencies = [ "mockall", "mockall_double", "num_cpus", - "opentelemetry 0.21.0", + "opentelemetry", "opentelemetry-otlp", - "opentelemetry_sdk 0.21.2", + "opentelemetry_sdk", "policy-evaluator", "pprof", "procfs", @@ -3974,9 +3935,9 @@ dependencies = [ "nix", "once_cell", "parking_lot", - "prost 0.12.3", + "prost", "prost-build", - "prost-derive 0.12.3", + "prost-derive", "sha2", "smallvec", "symbolic-demangle", @@ -4094,16 +4055,6 @@ dependencies = [ "hex", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.3" @@ -4111,7 +4062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", - "prost-derive 0.12.3", + "prost-derive", ] [[package]] @@ -4128,7 +4079,7 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.12.3", + "prost", "prost-types", "regex", "syn 2.0.53", @@ -4136,19 +4087,6 @@ dependencies = [ "which", ] -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "prost-derive" version = "0.12.3" @@ -4168,7 +4106,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ - "prost 0.12.3", + "prost", ] [[package]] @@ -5383,16 +5321,15 @@ dependencies = [ [[package]] name = "tonic" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ + "async-stream", "async-trait", "axum 0.6.20", "base64 0.21.7", "bytes", - "futures-core", - "futures-util", "h2 0.3.25", "http 0.2.12", "http-body 0.4.6", @@ -5400,7 +5337,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.11.9", + "prost", "tokio", "tokio-stream", "tower", @@ -5568,8 +5505,8 @@ checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" dependencies = [ "js-sys", "once_cell", - "opentelemetry 0.22.0", - "opentelemetry_sdk 0.22.1", + "opentelemetry", + "opentelemetry_sdk", "smallvec", "tracing", "tracing-core", diff --git a/Cargo.toml b/Cargo.toml index 30f30d09..01194e3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,12 +23,12 @@ k8s-openapi = { version = "0.21.1", default-features = false, features = [ lazy_static = "1.4.0" mime = "0.3" num_cpus = "1.16.0" -opentelemetry-otlp = { version = "0.14.0", features = ["metrics", "tonic"] } -opentelemetry = { version = "0.21", default-features = false, features = [ +opentelemetry-otlp = { version = "0.15.0", features = ["metrics", "tonic"] } +opentelemetry = { version = "0.22.0", default-features = false, features = [ "metrics", "trace", ] } -opentelemetry_sdk = { version = "0.21", features = ["rt-tokio"] } +opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio"] } procfs = "0.16" pprof = { version = "0.13", features = ["prost-codec"] } policy-evaluator = { git = "https://github.com/kubewarden/policy-evaluator", tag = "v0.16.2" } From fcb817aaca5f4477cc3e6f6623a7e257ce333442 Mon Sep 17 00:00:00 2001 From: Fabrizio Sestito Date: Fri, 15 Mar 2024 12:39:03 +0100 Subject: [PATCH 3/4] fix(metrics): rename MeterProvider in SdkMeterProvider Signed-off-by: Fabrizio Sestito --- src/metrics.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/metrics.rs b/src/metrics.rs index c65c1bec..cff4e9d8 100644 --- a/src/metrics.rs +++ b/src/metrics.rs @@ -1,6 +1,6 @@ use opentelemetry::{metrics, KeyValue}; use opentelemetry_otlp::{ExportConfig, WithExportConfig}; -use opentelemetry_sdk::metrics::MeterProvider; +use opentelemetry_sdk::metrics::SdkMeterProvider; use opentelemetry_sdk::runtime; mod policy_evaluations_total; @@ -10,7 +10,7 @@ pub use policy_evaluations_latency::record_policy_latency; const METER_NAME: &str = "kubewarden"; -pub fn setup_metrics() -> metrics::Result { +pub fn setup_metrics() -> metrics::Result { opentelemetry_otlp::new_pipeline() .metrics(runtime::Tokio) .with_exporter( From 4f17c71fd085cab6d8873b24bd34a2eab4d3b519 Mon Sep 17 00:00:00 2001 From: Fabrizio Sestito Date: Fri, 15 Mar 2024 12:39:25 +0100 Subject: [PATCH 4/4] docs: fix DEVELOPMENT.md boolean flags Signed-off-by: Fabrizio Sestito --- DEVELOPMENT.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 011c26df..d0e8aaef 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -27,8 +27,8 @@ cargo run --release -- \ --workers 2 \ --log-fmt otlp \ --log-level debug \ - --enable-metrics true \ - --ignore-kubernetes-connection-failure true + --enable-metrics \ + --ignore-kubernetes-connection-failure ``` Some notes about this command: