From 959fd98531aacc243fab5a2ca3501ec668ac2c38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 19:55:01 +0000 Subject: [PATCH] editoast: bump the opentelemetry group in /editoast with 2 updates Bumps the opentelemetry group in /editoast with 2 updates: [opentelemetry](https://github.com/open-telemetry/opentelemetry-rust) and [opentelemetry_sdk](https://github.com/open-telemetry/opentelemetry-rust). Updates `opentelemetry` from 0.27.0 to 0.27.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/opentelemetry-0.27.0...opentelemetry-0.27.1) Updates `opentelemetry_sdk` from 0.27.0 to 0.27.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/opentelemetry_sdk-0.27.0...opentelemetry_sdk-0.27.1) --- updated-dependencies: - dependency-name: opentelemetry dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry - dependency-name: opentelemetry_sdk dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry ... Signed-off-by: dependabot[bot] Signed-off-by: Jean SIMARD --- editoast/Cargo.lock | 11 +++++------ editoast/Cargo.toml | 4 ++-- editoast/src/main.rs | 3 +-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/editoast/Cargo.lock b/editoast/Cargo.lock index a541ef24331..86e93ff2c30 100644 --- a/editoast/Cargo.lock +++ b/editoast/Cargo.lock @@ -3037,16 +3037,16 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3cebff57f7dbd1255b44d8bddc2cebeb0ea677dbaa2e25a3070a91b318f660" +checksum = "ab70038c28ed37b97d8ed414b6429d343a8bbf44c9f79ec854f3a643029ba6d7" dependencies = [ "futures-core", "futures-sink", "js-sys", - "once_cell", "pin-project-lite", "thiserror 1.0.69", + "tracing", ] [[package]] @@ -3087,16 +3087,15 @@ checksum = "db945c1eaea8ac6a9677185357480d215bb6999faa9f691d0c4d4d641eab7a09" [[package]] name = "opentelemetry_sdk" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b742c1cae4693792cc564e58d75a2a0ba29421a34a85b50da92efa89ecb2bc" +checksum = "231e9d6ceef9b0b2546ddf52335785ce41252bc7474ee8ba05bfad277be13ab8" dependencies = [ "async-trait", "futures-channel", "futures-executor", "futures-util", "glob", - "once_cell", "opentelemetry", "percent-encoding", "rand", diff --git a/editoast/Cargo.toml b/editoast/Cargo.toml index 5e201796d92..b70a36242b0 100644 --- a/editoast/Cargo.toml +++ b/editoast/Cargo.toml @@ -138,7 +138,7 @@ json-patch = { version = "3.0.1", default-features = false, features = [ lapin = "2.5.0" mime = "0.3.17" mvt.workspace = true -opentelemetry = { version = "0.27.0", default-features = false, features = [ +opentelemetry = { version = "0.27.1", default-features = false, features = [ "trace", ] } opentelemetry-otlp = { version = "0.27.0", default-features = false, features = [ @@ -146,7 +146,7 @@ opentelemetry-otlp = { version = "0.27.0", default-features = false, features = "trace", ] } opentelemetry-semantic-conventions.workspace = true -opentelemetry_sdk = { version = "0.27.0", features = ["rt-tokio", "trace"] } +opentelemetry_sdk = { version = "0.27.1", features = ["rt-tokio", "trace"] } ordered-float = { version = "4.5.0", features = ["serde"] } osm_to_railjson = { path = "./osm_to_railjson" } paste.workspace = true diff --git a/editoast/src/main.rs b/editoast/src/main.rs index a97989bfa0b..7ca4b46553f 100644 --- a/editoast/src/main.rs +++ b/editoast/src/main.rs @@ -106,10 +106,9 @@ fn init_tracing(mode: EditoastMode, telemetry_config: &client::TelemetryConfig) Box::new(EnvResourceDetector::new()), ], )); - let trace_config = opentelemetry_sdk::trace::Config::default().with_resource(resource); let otlp_tracer = opentelemetry_sdk::trace::TracerProvider::builder() .with_batch_exporter(exporter, opentelemetry_sdk::runtime::Tokio) - .with_config(trace_config) + .with_resource(resource) .build() .tracer("osrd-editoast"); let layer = tracing_opentelemetry::OpenTelemetryLayer::new(otlp_tracer);