Skip to content

Commit

Permalink
editoast: bump the opentelemetry group across 1 directory with 5 updates
Browse files Browse the repository at this point in the history
Bumps the opentelemetry group with 5 updates in the /editoast directory:

| Package | From | To |
| --- | --- | --- |
| [axum-tracing-opentelemetry](https://github.com/davidB/tracing-opentelemetry-instrumentation-sdk) | `0.25.0` | `0.26.1` |
| [opentelemetry](https://github.com/open-telemetry/opentelemetry-rust) | `0.27.1` | `0.28.0` |
| [opentelemetry-otlp](https://github.com/open-telemetry/opentelemetry-rust) | `0.27.0` | `0.28.0` |
| [opentelemetry_sdk](https://github.com/open-telemetry/opentelemetry-rust) | `0.27.1` | `0.28.0` |
| [tracing-opentelemetry](https://github.com/tokio-rs/tracing-opentelemetry) | `0.28.0` | `0.29.0` |



Updates `axum-tracing-opentelemetry` from 0.25.0 to 0.26.1
- [Release notes](https://github.com/davidB/tracing-opentelemetry-instrumentation-sdk/releases)
- [Changelog](https://github.com/davidB/tracing-opentelemetry-instrumentation-sdk/blob/main/CHANGELOG.md)
- [Commits](davidB/tracing-opentelemetry-instrumentation-sdk@axum-tracing-opentelemetry-v0.25.0...axum-tracing-opentelemetry-v0.26.1)

Updates `opentelemetry` from 0.27.1 to 0.28.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases)
- [Commits](open-telemetry/opentelemetry-rust@opentelemetry-0.27.1...opentelemetry-0.28.0)

Updates `opentelemetry-otlp` from 0.27.0 to 0.28.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases)
- [Commits](open-telemetry/opentelemetry-rust@opentelemetry-otlp-0.27.0...opentelemetry-otlp-0.28.0)

Updates `opentelemetry_sdk` from 0.27.1 to 0.28.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases)
- [Commits](open-telemetry/opentelemetry-rust@opentelemetry_sdk-0.27.1...opentelemetry_sdk-0.28.0)

Updates `tracing-opentelemetry` from 0.28.0 to 0.29.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](tokio-rs/tracing-opentelemetry@v0.28.0...v0.29.0)

---
updated-dependencies:
- dependency-name: axum-tracing-opentelemetry
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry
- dependency-name: opentelemetry
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry
- dependency-name: opentelemetry-otlp
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry
- dependency-name: opentelemetry_sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry
- dependency-name: tracing-opentelemetry
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry
...

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
dependabot[bot] authored and woshilapin committed Mar 7, 2025
1 parent 28261be commit 007883a
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 58 deletions.
84 changes: 66 additions & 18 deletions editoast/Cargo.lock

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

11 changes: 6 additions & 5 deletions editoast/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ hostname = "0.4.0"
itertools = "0.13.0"
mvt = "0.9.5"
openssl = "0.10.71"
opentelemetry = { version = "0.27.1", default-features = false, features = [
opentelemetry = { version = "0.28.0", default-features = false, features = [
"trace",
] }
opentelemetry-semantic-conventions = { version = "0.26", features = [
"semconv_experimental",
] }
opentelemetry_sdk = { version = "0.27.1", features = ["rt-tokio", "trace"] }
opentelemetry_sdk = { version = "0.28.0", features = ["rt-tokio", "trace"] }
paste = "1.0.15"
postgis_diesel = { version = "2.4.1", features = ["serde"] }
postgres-openssl = "0.5.1"
Expand All @@ -92,7 +92,7 @@ tracing = { version = "0.1.41", default-features = false, features = [
"attributes",
"log",
] }
tracing-opentelemetry = { version = "0.28.0", default-features = false, features = [
tracing-opentelemetry = { version = "0.29.0", default-features = false, features = [
"tracing-log",
] }
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
Expand All @@ -113,7 +113,7 @@ axum-extra = { version = "0.10.0", default-features = false, features = [
"typed-header",
] }
axum-test = { version = "17.1.0", default-features = false }
axum-tracing-opentelemetry = { version = "0.25.0", default-features = false, features = [
axum-tracing-opentelemetry = { version = "0.26.1", default-features = false, features = [
"tracing_level_info",
] }
chrono.workspace = true
Expand Down Expand Up @@ -168,7 +168,7 @@ lz4_flex = { version = "0.11.3", default-features = false, features = [
mime = "0.3.17"
mvt.workspace = true
opentelemetry.workspace = true
opentelemetry-otlp = { version = "0.27.0", default-features = false, features = [
opentelemetry-otlp = { version = "0.28.0", default-features = false, features = [
"grpc-tonic",
"trace",
] }
Expand Down Expand Up @@ -224,6 +224,7 @@ axum = { version = "0.8.1", default-features = false, features = [
editoast_authz = { workspace = true, features = ["fixtures"] }
editoast_models = { workspace = true, features = ["testing"] }
editoast_osrdyne_client = { workspace = true, features = ["mock_client"] }
opentelemetry_sdk = { workspace = true, features = ["testing"] }
pretty_assertions.workspace = true
rstest.workspace = true
serial_test = "3.2.0"
Expand Down
27 changes: 6 additions & 21 deletions editoast/editoast_common/src/tracing.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
use std::time::Duration;

use opentelemetry::trace::TracerProvider;
use opentelemetry::KeyValue;
use opentelemetry_sdk::export::trace::SpanExporter;
use opentelemetry_sdk::propagation::TraceContextPropagator;
use opentelemetry_sdk::resource::EnvResourceDetector;
use opentelemetry_sdk::resource::SdkProvidedResourceDetector;
use opentelemetry_sdk::resource::TelemetryResourceDetector;
use opentelemetry_sdk::trace::SpanExporter;
use opentelemetry_sdk::Resource;
use tracing_subscriber::layer::SubscriberExt;
use tracing_subscriber::Layer;
Expand Down Expand Up @@ -59,20 +53,11 @@ pub fn create_tracing_subscriber<T: SpanExporter + 'static>(
let telemetry_layer = match tracing_config.telemetry {
None => None,
Some(telemetry) => {
let resource = Resource::new(vec![KeyValue::new(
opentelemetry_semantic_conventions::resource::SERVICE_NAME,
telemetry.service_name.clone(),
)])
.merge(&Resource::from_detectors(
Duration::from_secs(10),
vec![
Box::new(SdkProvidedResourceDetector),
Box::new(TelemetryResourceDetector),
Box::new(EnvResourceDetector::new()),
],
));
let otlp_tracer = opentelemetry_sdk::trace::TracerProvider::builder()
.with_batch_exporter(exporter, opentelemetry_sdk::runtime::Tokio)
let resource = Resource::builder()
.with_service_name(telemetry.service_name.clone())
.build();
let otlp_tracer = opentelemetry_sdk::trace::SdkTracerProvider::builder()
.with_batch_exporter(exporter)
.with_resource(resource)
.build()
.tracer("osrd-editoast");
Expand Down
16 changes: 2 additions & 14 deletions editoast/src/views/test_app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ use editoast_common::tracing::TracingConfig;
use editoast_models::DbConnectionPoolV2;
use editoast_osrdyne_client::OsrdyneClient;
use futures::executor::block_on;
use futures::future::BoxFuture;
use opentelemetry_sdk::export::trace::ExportResult;
use opentelemetry_sdk::export::trace::SpanData;
use opentelemetry_sdk::export::trace::SpanExporter;
use opentelemetry_sdk::testing::trace::NoopSpanExporter;
use serde::de::DeserializeOwned;
use tower_http::trace::TraceLayer;
use tracing_subscriber::filter::Directive;
Expand All @@ -46,15 +43,6 @@ use super::OsrdyneConfig;
use super::PostgresConfig;
use super::ServerConfig;

#[derive(Debug)]
pub struct NoopSpanExporter;

impl SpanExporter for NoopSpanExporter {
fn export(&mut self, _: Vec<SpanData>) -> BoxFuture<'static, ExportResult> {
Box::pin(std::future::ready(Ok(())))
}
}

/// A builder interface for [TestApp]
///
/// It allows configuring some parameters for the app service.
Expand Down Expand Up @@ -199,7 +187,7 @@ impl TestAppBuilder {
let sub = create_tracing_subscriber(
tracing_config,
tracing_subscriber::filter::LevelFilter::DEBUG,
NoopSpanExporter,
NoopSpanExporter::new(),
);
let tracing_guard = tracing::subscriber::set_default(sub);

Expand Down

0 comments on commit 007883a

Please sign in to comment.