Skip to content

Commit 881010a

Browse files
dependabot[bot]woshilapin
authored andcommitted
editoast: bump the opentelemetry group across 1 directory with 5 updates
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]>
1 parent 8734217 commit 881010a

File tree

4 files changed

+83
-61
lines changed

4 files changed

+83
-61
lines changed

editoast/Cargo.lock

+69-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

editoast/Cargo.toml

+6-5
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ hostname = "0.4.0"
6060
itertools = "0.13.0"
6161
mvt = "0.9.5"
6262
openssl = "0.10.71"
63-
opentelemetry = { version = "0.27.1", default-features = false, features = [
63+
opentelemetry = { version = "0.28.0", default-features = false, features = [
6464
"trace",
6565
] }
6666
opentelemetry-semantic-conventions = { version = "0.26", features = [
6767
"semconv_experimental",
6868
] }
69-
opentelemetry_sdk = { version = "0.27.1", features = ["rt-tokio", "trace"] }
69+
opentelemetry_sdk = { version = "0.28.0", features = ["rt-tokio", "trace"] }
7070
paste = "1.0.15"
7171
postgis_diesel = { version = "2.4.1", features = ["serde"] }
7272
postgres-openssl = "0.5.1"
@@ -92,7 +92,7 @@ tracing = { version = "0.1.41", default-features = false, features = [
9292
"attributes",
9393
"log",
9494
] }
95-
tracing-opentelemetry = { version = "0.28.0", default-features = false, features = [
95+
tracing-opentelemetry = { version = "0.29.0", default-features = false, features = [
9696
"tracing-log",
9797
] }
9898
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
@@ -113,7 +113,7 @@ axum-extra = { version = "0.10.0", default-features = false, features = [
113113
"typed-header",
114114
] }
115115
axum-test = { version = "17.1.0", default-features = false }
116-
axum-tracing-opentelemetry = { version = "0.25.0", default-features = false, features = [
116+
axum-tracing-opentelemetry = { version = "0.26.1", default-features = false, features = [
117117
"tracing_level_info",
118118
] }
119119
chrono.workspace = true
@@ -168,7 +168,7 @@ lz4_flex = { version = "0.11.3", default-features = false, features = [
168168
mime = "0.3.17"
169169
mvt.workspace = true
170170
opentelemetry.workspace = true
171-
opentelemetry-otlp = { version = "0.27.0", default-features = false, features = [
171+
opentelemetry-otlp = { version = "0.28.0", default-features = false, features = [
172172
"grpc-tonic",
173173
"trace",
174174
] }
@@ -224,6 +224,7 @@ axum = { version = "0.8.1", default-features = false, features = [
224224
editoast_authz = { workspace = true, features = ["fixtures"] }
225225
editoast_models = { workspace = true, features = ["testing"] }
226226
editoast_osrdyne_client = { workspace = true, features = ["mock_client"] }
227+
opentelemetry_sdk = { workspace = true, features = ["testing"] }
227228
pretty_assertions.workspace = true
228229
rstest.workspace = true
229230
serial_test = "3.2.0"

editoast/editoast_common/src/tracing.rs

+6-21
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
use std::time::Duration;
2-
31
use opentelemetry::trace::TracerProvider;
4-
use opentelemetry::KeyValue;
5-
use opentelemetry_sdk::export::trace::SpanExporter;
62
use opentelemetry_sdk::propagation::TraceContextPropagator;
7-
use opentelemetry_sdk::resource::EnvResourceDetector;
8-
use opentelemetry_sdk::resource::SdkProvidedResourceDetector;
9-
use opentelemetry_sdk::resource::TelemetryResourceDetector;
3+
use opentelemetry_sdk::trace::SpanExporter;
104
use opentelemetry_sdk::Resource;
115
use tracing_subscriber::layer::SubscriberExt;
126
use tracing_subscriber::Layer;
@@ -59,20 +53,11 @@ pub fn create_tracing_subscriber<T: SpanExporter + 'static>(
5953
let telemetry_layer = match tracing_config.telemetry {
6054
None => None,
6155
Some(telemetry) => {
62-
let resource = Resource::new(vec![KeyValue::new(
63-
opentelemetry_semantic_conventions::resource::SERVICE_NAME,
64-
telemetry.service_name.clone(),
65-
)])
66-
.merge(&Resource::from_detectors(
67-
Duration::from_secs(10),
68-
vec![
69-
Box::new(SdkProvidedResourceDetector),
70-
Box::new(TelemetryResourceDetector),
71-
Box::new(EnvResourceDetector::new()),
72-
],
73-
));
74-
let otlp_tracer = opentelemetry_sdk::trace::TracerProvider::builder()
75-
.with_batch_exporter(exporter, opentelemetry_sdk::runtime::Tokio)
56+
let resource = Resource::builder()
57+
.with_service_name(telemetry.service_name.clone())
58+
.build();
59+
let otlp_tracer = opentelemetry_sdk::trace::SdkTracerProvider::builder()
60+
.with_batch_exporter(exporter)
7661
.with_resource(resource)
7762
.build()
7863
.tracer("osrd-editoast");

editoast/src/views/test_app.rs

+2-14
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ use editoast_common::tracing::TracingConfig;
1818
use editoast_models::DbConnectionPoolV2;
1919
use editoast_osrdyne_client::OsrdyneClient;
2020
use futures::executor::block_on;
21-
use futures::future::BoxFuture;
22-
use opentelemetry_sdk::export::trace::ExportResult;
23-
use opentelemetry_sdk::export::trace::SpanData;
24-
use opentelemetry_sdk::export::trace::SpanExporter;
21+
use opentelemetry_sdk::testing::trace::NoopSpanExporter;
2522
use serde::de::DeserializeOwned;
2623
use tower_http::trace::TraceLayer;
2724
use tracing_subscriber::filter::Directive;
@@ -46,15 +43,6 @@ use super::OsrdyneConfig;
4643
use super::PostgresConfig;
4744
use super::ServerConfig;
4845

49-
#[derive(Debug)]
50-
pub struct NoopSpanExporter;
51-
52-
impl SpanExporter for NoopSpanExporter {
53-
fn export(&mut self, _: Vec<SpanData>) -> BoxFuture<'static, ExportResult> {
54-
Box::pin(std::future::ready(Ok(())))
55-
}
56-
}
57-
5846
/// A builder interface for [TestApp]
5947
///
6048
/// It allows configuring some parameters for the app service.
@@ -199,7 +187,7 @@ impl TestAppBuilder {
199187
let sub = create_tracing_subscriber(
200188
tracing_config,
201189
tracing_subscriber::filter::LevelFilter::DEBUG,
202-
NoopSpanExporter,
190+
NoopSpanExporter::new(),
203191
);
204192
let tracing_guard = tracing::subscriber::set_default(sub);
205193

0 commit comments

Comments
 (0)