Skip to content

Commit

Permalink
build(deps): bump opentelemetry from 0.21.0 to 0.22.0, opentelemetry_…
Browse files Browse the repository at this point in the history
…sdk from 0.21.2 to 0.22.1, opentelemetry-prometheus from 0.14.1 to 0.15.0
  • Loading branch information
QuantumDancer committed Mar 11, 2024
1 parent 4d742ed commit 64dd821
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 24 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
69 changes: 57 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions auditor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions auditor/src/metrics/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down Expand Up @@ -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();

Expand Down
6 changes: 3 additions & 3 deletions plugins/priority/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
6 changes: 3 additions & 3 deletions plugins/priority/src/metrics/mod.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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();

Expand Down

0 comments on commit 64dd821

Please sign in to comment.