Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

editoast: bump the opentelemetry group in /editoast with 5 updates #9767

Merged
merged 1 commit into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions editoast/Cargo.lock

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

10 changes: 5 additions & 5 deletions editoast/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ axum-extra = { version = "0.9.4", default-features = false, features = [
"typed-header",
] }
axum-test = { version = "16.4.0", default-features = false }
axum-tracing-opentelemetry = { version = "0.23.0", default-features = false }
axum-tracing-opentelemetry = { version = "0.24.0", default-features = false }
chrono.workspace = true
clap = { version = "4.5.21", features = ["derive", "env"] }
colored = "2.1.0"
Expand Down Expand Up @@ -138,15 +138,15 @@ json-patch = { version = "3.0.1", default-features = false, features = [
lapin = "2.5.0"
mime = "0.3.17"
mvt.workspace = true
opentelemetry = { version = "0.26.0", default-features = false, features = [
opentelemetry = { version = "0.27.0", default-features = false, features = [
"trace",
] }
opentelemetry-otlp = { version = "0.26.0", default-features = false, features = [
opentelemetry-otlp = { version = "0.27.0", default-features = false, features = [
"grpc-tonic",
"trace",
] }
opentelemetry-semantic-conventions.workspace = true
opentelemetry_sdk = { version = "0.26.0", features = ["rt-tokio", "trace"] }
opentelemetry_sdk = { version = "0.27.0", features = ["rt-tokio", "trace"] }
ordered-float = { version = "4.5.0", features = ["serde"] }
osm_to_railjson = { path = "./osm_to_railjson" }
paste.workspace = true
Expand Down Expand Up @@ -180,7 +180,7 @@ tower-http = { version = "0.6.1", features = [
"trace",
] }
tracing.workspace = true
tracing-opentelemetry = { version = "0.27.0", default-features = false, features = [
tracing-opentelemetry = { version = "0.28.0", default-features = false, features = [
"tracing-log",
] }
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
Expand Down
18 changes: 9 additions & 9 deletions editoast/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,11 @@ fn init_tracing(mode: EditoastMode, telemetry_config: &client::TelemetryConfig)
let telemetry_layer = match telemetry_config.telemetry_kind {
client::TelemetryKind::None => None,
client::TelemetryKind::Opentelemetry => {
let exporter = opentelemetry_otlp::new_exporter()
.tonic()
.with_endpoint(telemetry_config.telemetry_endpoint.as_str());
let exporter = opentelemetry_otlp::SpanExporter::builder()
.with_tonic()
.with_endpoint(telemetry_config.telemetry_endpoint.as_str())
.build()
.expect("failed to build a span exporter");
let resource = Resource::new(vec![KeyValue::new(
opentelemetry_semantic_conventions::resource::SERVICE_NAME,
telemetry_config.service_name.clone(),
Expand All @@ -105,12 +107,10 @@ fn init_tracing(mode: EditoastMode, telemetry_config: &client::TelemetryConfig)
],
));
let trace_config = opentelemetry_sdk::trace::Config::default().with_resource(resource);
let otlp_tracer = opentelemetry_otlp::new_pipeline()
.tracing()
.with_exporter(exporter)
.with_trace_config(trace_config)
.install_batch(opentelemetry_sdk::runtime::Tokio)
.expect("Failed to initialize Opentelemetry tracer")
let otlp_tracer = opentelemetry_sdk::trace::TracerProvider::builder()
.with_batch_exporter(exporter, opentelemetry_sdk::runtime::Tokio)
.with_config(trace_config)
.build()
.tracer("osrd-editoast");
let layer = tracing_opentelemetry::OpenTelemetryLayer::new(otlp_tracer);
opentelemetry::global::set_text_map_propagator(TraceContextPropagator::new());
Expand Down
Loading