From 64dd821df4b6920aba34f7e7d57a73a3a268dd6d Mon Sep 17 00:00:00 2001 From: Benjamin Rottler Date: Thu, 7 Mar 2024 12:00:39 +0100 Subject: [PATCH] build(deps): bump opentelemetry from 0.21.0 to 0.22.0, opentelemetry_sdk from 0.21.2 to 0.22.1, opentelemetry-prometheus from 0.14.1 to 0.15.0 --- CHANGELOG.md | 3 ++ Cargo.lock | 69 ++++++++++++++++++++++++----- auditor/Cargo.toml | 6 +-- auditor/src/metrics/mod.rs | 6 +-- plugins/priority/Cargo.toml | 6 +-- plugins/priority/src/metrics/mod.rs | 6 +-- 6 files changed, 72 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61a696cd..b5321e1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Dependencies: Update cryptography from 42.0.2 to 42.0.5 ([@dirksammel](https://github.com/dirksammel)) - Dependencies: Update iana-time-zone from 0.1.59 to 0.1.60 ([@QuantumDancer](https://github.com/QuantumDancer)) - Dependencies: Update num-traits from 0.2.17 to 0.2.18 ([@QuantumDancer](https://github.com/QuantumDancer)) +- Dependencies: Update opentelemetry from 0.21.0 to 0.22.0 ([@QuantumDancer](https://github.com/QuantumDancer)) +- Dependencies: Update opentelemetry-prometheus from 0.14.1 to 0.15.0 ([@QuantumDancer](https://github.com/QuantumDancer)) +- Dependencies: Update opentelemetry_sdk from 0.21.2 to 0.22.1 ([@QuantumDancer](https://github.com/QuantumDancer)) - Dependencies: Update pyo3 from 0.19.2 to 0.20.3 ([@dirksammel](https://github.com/dirksammel), [@QuantumDancer](https://github.com/QuantumDancer)) - Dependencies: Update pyo3-asyncio from 0.19 to 0.20 ([@dirksammel](https://github.com/dirksammel)) - Dependencies: Update pytest from 8.0.0 to 8.0.2 ([@dirksammel](https://github.com/dirksammel)) diff --git a/Cargo.lock b/Cargo.lock index 9fa4cdf0..c4587621 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -190,8 +190,8 @@ dependencies = [ "actix-http", "actix-web", "futures-util", - "opentelemetry", - "opentelemetry-prometheus", + "opentelemetry 0.21.0", + "opentelemetry-prometheus 0.14.1", "opentelemetry-semantic-conventions", "prometheus", "serde", @@ -341,10 +341,10 @@ dependencies = [ "itertools", "num-traits", "once_cell", - "opentelemetry", - "opentelemetry-prometheus", + "opentelemetry 0.22.0", + "opentelemetry-prometheus 0.15.0", "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry_sdk 0.22.1", "prometheus", "quickcheck", "quickcheck_macros", @@ -382,10 +382,10 @@ dependencies = [ "chrono", "config", "num-traits", - "opentelemetry", - "opentelemetry-prometheus", + "opentelemetry 0.22.0", + "opentelemetry-prometheus 0.15.0", "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry_sdk 0.22.1", "prometheus", "serde", "serde-aux", @@ -1797,6 +1797,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-prometheus" version = "0.14.1" @@ -1804,8 +1819,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f8f082da115b0dcb250829e3ed0b8792b8f963a1ad42466e48422fbe6a079bd" dependencies = [ "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.21.0", + "opentelemetry_sdk 0.21.2", + "prometheus", + "protobuf", +] + +[[package]] +name = "opentelemetry-prometheus" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30bbcf6341cab7e2193e5843f0ac36c446a5b3fccb28747afaeda17996dcd02e" +dependencies = [ + "once_cell", + "opentelemetry 0.22.0", + "opentelemetry_sdk 0.22.1", "prometheus", "protobuf", ] @@ -1816,7 +1844,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" dependencies = [ - "opentelemetry", + "opentelemetry 0.21.0", ] [[package]] @@ -1840,6 +1868,23 @@ name = "opentelemetry_sdk" version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry 0.21.0", + "ordered-float", + "thiserror", +] + +[[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", @@ -1848,7 +1893,7 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.22.0", "ordered-float", "percent-encoding", "rand", diff --git a/auditor/Cargo.toml b/auditor/Cargo.toml index 9ca5be6f..9ca913b5 100644 --- a/auditor/Cargo.toml +++ b/auditor/Cargo.toml @@ -56,11 +56,11 @@ reqwest = { version = "0.11.24", default-features = false, features = ["json", " anyhow = "1" regex = "1" num-traits = "^0.2" -opentelemetry-prometheus = "0.14" -opentelemetry = "0.21" +opentelemetry-prometheus = "0.15.0" +opentelemetry = "0.22.0" actix-web-opentelemetry = { version = "0.16", features = ["metrics", "metrics-prometheus"] } opentelemetry_api = "0.20.0" -opentelemetry_sdk = "0.21.2" +opentelemetry_sdk = "0.22.1" thiserror = "1" prometheus = "0.13" itertools = "0.12.1" diff --git a/auditor/src/metrics/mod.rs b/auditor/src/metrics/mod.rs index ed60903b..26831f27 100644 --- a/auditor/src/metrics/mod.rs +++ b/auditor/src/metrics/mod.rs @@ -5,14 +5,14 @@ // http://opensource.org/licenses/MIT>, at your option. This file may not be // copied, modified, or distributed except according to those terms. -use opentelemetry_sdk::metrics::MeterProvider; +use opentelemetry_sdk::metrics::SdkMeterProvider; use prometheus::Registry; mod database; pub use database::*; pub struct PrometheusExporterConfig { - pub provider: MeterProvider, + pub provider: SdkMeterProvider, pub prom_registry: Registry, } @@ -42,7 +42,7 @@ impl PrometheusExporterBuilder { .with_registry(prom_registry.clone()) .build()?; - let provider = MeterProvider::builder() + let provider = SdkMeterProvider::builder() .with_reader(metrics_exporter) .build(); diff --git a/plugins/priority/Cargo.toml b/plugins/priority/Cargo.toml index f10fa073..a122a839 100644 --- a/plugins/priority/Cargo.toml +++ b/plugins/priority/Cargo.toml @@ -45,11 +45,11 @@ num-traits = "^0.2" anyhow = "1" shell-words = "^1" actix-web-opentelemetry = { version = "0.16", features = ["metrics", "metrics-prometheus"] } -opentelemetry = "0.21" +opentelemetry = "0.22.0" opentelemetry_api = "0.20.0" -opentelemetry_sdk = "0.21.2" +opentelemetry_sdk = "0.22.1" tracing-actix-web = "0.7" prometheus = "0.13" -opentelemetry-prometheus = "0.14" +opentelemetry-prometheus = "0.15.0" [dev-dependencies] diff --git a/plugins/priority/src/metrics/mod.rs b/plugins/priority/src/metrics/mod.rs index 9e53d152..e5363fdf 100644 --- a/plugins/priority/src/metrics/mod.rs +++ b/plugins/priority/src/metrics/mod.rs @@ -1,12 +1,12 @@ use crate::configuration::PrometheusMetricsOptions; -use opentelemetry_sdk::metrics::MeterProvider; +use opentelemetry_sdk::metrics::SdkMeterProvider; use prometheus::Registry; use prometheus::{IntGaugeVec, Opts}; use std::collections::HashMap; #[derive(Clone)] pub struct PrometheusExporterConfig { - pub provider: MeterProvider, + pub provider: SdkMeterProvider, pub prom_registry: Registry, pub resource_metric: IntGaugeVec, pub priority_metric: IntGaugeVec, @@ -32,7 +32,7 @@ impl PrometheusExporterConfig { prom_registry.register(Box::new(resource_metric.clone()))?; prom_registry.register(Box::new(priority_metric.clone()))?; - let provider = MeterProvider::builder() + let provider = SdkMeterProvider::builder() .with_reader(metrics_exporter) .build();