Skip to content

Commit b33240d

Browse files
committed
feat(deps): upgrade to opentelemetry 0.29
1 parent 21884de commit b33240d

File tree

11 files changed

+23
-19
lines changed

11 files changed

+23
-19
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ assert2 = "0.3"
2626
axum = { version = "0.8", default-features = false }
2727
http = "^1"
2828
hyper = "1"
29-
insta = { version = "1", features = ["redactions", "yaml"] }
29+
insta = { version = "^1", features = ["redactions", "yaml"] }
3030
opentelemetry = { version = "0.29", features = [
3131
"trace",
3232
], default-features = false }

deny.toml

-2
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,6 @@ skip = [
219219
# "hermit-abi",
220220
# "rustls-native-certs",
221221
"hashbrown",
222-
"thiserror", # until every dependency use thiserror 2
223-
"thiserror-impl",
224222
"getrandom",
225223
"wasi",
226224
]

examples/axum-otlp/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ opentelemetry-otlp = { workspace = true, default-features = false, features = [
2020
"http-proto",
2121
"tls",
2222
] }
23-
serde_json = "1.0.79"
23+
serde_json = "1"
2424
tokio = { workspace = true, features = ["full"] }
2525
tracing = { workspace = true }
2626
tracing-opentelemetry-instrumentation-sdk = { path = "../../tracing-opentelemetry-instrumentation-sdk" }

examples/load/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ init-tracing-opentelemetry = { path = "../../init-tracing-opentelemetry", featur
1212
"otlp",
1313
"tracing_subscriber_ext",
1414
] }
15-
memory-stats = "1.1"
15+
memory-stats = "1"
1616
opentelemetry = { workspace = true }
17-
serde_json = "1.0.79"
18-
tokio = { version = "1.0", features = ["full"] }
17+
serde_json = "1"
18+
tokio = { version = "1", features = ["full"] }
1919
tracing = { workspace = true }
2020
tracing-opentelemetry-instrumentation-sdk = { path = "../../tracing-opentelemetry-instrumentation-sdk" }

fake-opentelemetry-collector/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ opentelemetry_sdk = { workspace = true, features = [
3333
serde = { version = "1", features = ["derive"] }
3434
tokio = { workspace = true, features = ["full"] }
3535
tokio-stream = { workspace = true, features = ["net"] }
36-
tonic = { workspace = true }
36+
tonic = { workspace = true, features = ["codegen", "transport"]}
3737
tracing = { workspace = true }
3838

3939
[dev-dependencies]

init-tracing-opentelemetry/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ opentelemetry-semantic-conventions = { workspace = true, optional = true }
2727
opentelemetry-zipkin = { workspace = true, features = [], optional = true }
2828
opentelemetry_sdk = { workspace = true }
2929
thiserror = "2"
30-
tonic = { workspace = true, optional = true, features = ["tls"] }
30+
tonic = { workspace = true, optional = true }
3131
tracing = { workspace = true }
3232
tracing-logfmt = { version = "0.3", optional = true }
3333
tracing-opentelemetry = { workspace = true }
@@ -70,5 +70,7 @@ tracer = ["dep:opentelemetry-semantic-conventions"]
7070
xray = ["dep:opentelemetry-aws"]
7171
zipkin = ["dep:opentelemetry-zipkin"]
7272
tracing_subscriber_ext = ["dep:tracing-subscriber", "otlp"]
73-
tls = ["tonic/tls", "opentelemetry-otlp/tls", "opentelemetry-otlp/tls-roots"]
73+
tls = ["opentelemetry-otlp/tls"]
74+
tls-roots = ["opentelemetry-otlp/tls-roots"]
75+
tls-webpki-roots = ["opentelemetry-otlp/tls-webpki-roots"]
7476
logfmt = ["dep:tracing-logfmt"]

init-tracing-opentelemetry/src/error.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ pub enum Error {
77
SetGlobalDefaultError(#[from] tracing::subscriber::SetGlobalDefaultError),
88

99
#[error(transparent)]
10-
TraceError(#[from] opentelemetry::trace::TraceError),
10+
TraceError(#[from] opentelemetry_sdk::trace::TraceError),
11+
12+
#[cfg(feature = "otlp")]
13+
#[error(transparent)]
14+
ExporterBuildError(#[from] opentelemetry_otlp::ExporterBuildError),
1115

1216
#[cfg(feature = "tracing_subscriber_ext")]
1317
#[error(transparent)]

init-tracing-opentelemetry/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ mod error;
1010
pub use error::Error;
1111

1212
use opentelemetry::propagation::{TextMapCompositePropagator, TextMapPropagator};
13-
use opentelemetry::trace::TraceError;
1413
use opentelemetry_sdk::propagation::{BaggagePropagator, TraceContextPropagator};
14+
use opentelemetry_sdk::trace::TraceError;
1515

1616
#[cfg(feature = "otlp")]
1717
pub mod otlp;

init-tracing-opentelemetry/src/otlp.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
use opentelemetry::trace::TraceError;
2-
use opentelemetry_otlp::SpanExporter;
1+
use opentelemetry_otlp::{ExporterBuildError, SpanExporter};
32
use opentelemetry_sdk::{trace::SdkTracerProvider, trace::TracerProviderBuilder, Resource};
43
#[cfg(feature = "tls")]
54
use {opentelemetry_otlp::WithTonicConfig, tonic::transport::ClientTlsConfig};
@@ -13,7 +12,7 @@ pub fn identity(v: TracerProviderBuilder) -> TracerProviderBuilder {
1312
pub fn init_tracerprovider<F>(
1413
resource: Resource,
1514
transform: F,
16-
) -> Result<SdkTracerProvider, TraceError>
15+
) -> Result<SdkTracerProvider, ExporterBuildError>
1716
where
1817
F: FnOnce(TracerProviderBuilder) -> TracerProviderBuilder,
1918
{

init-tracing-opentelemetry/src/stdio.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use opentelemetry::trace::{TraceError, TracerProvider as _};
1+
use crate::Error;
2+
use opentelemetry::trace::TracerProvider as _;
23
use opentelemetry::InstrumentationScope;
34
use opentelemetry_sdk::trace as sdktrace;
45
use opentelemetry_sdk::trace::BatchSpanProcessor;
@@ -13,7 +14,7 @@ pub fn identity<W: Write>(v: TracerProviderBuilder) -> TracerProviderBuilder {
1314
v
1415
}
1516

16-
pub fn init_tracer<F, W>(resource: Resource, transform: F) -> Result<sdktrace::Tracer, TraceError>
17+
pub fn init_tracer<F, W>(resource: Resource, transform: F) -> Result<sdktrace::Tracer, Error>
1718
where
1819
F: FnOnce(TracerProviderBuilder) -> TracerProviderBuilder,
1920
W: Write + Debug + Send + Sync + 'static,

init-tracing-opentelemetry/src/tracing_subscriber_ext.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use opentelemetry::trace::{TraceError, TracerProvider};
1+
use opentelemetry::trace::TracerProvider;
22
use opentelemetry_sdk::trace::{SdkTracerProvider, Tracer};
33
use tracing::{info, level_filters::LevelFilter, Subscriber};
44
use tracing_opentelemetry::OpenTelemetryLayer;
@@ -80,7 +80,7 @@ pub fn build_level_filter_layer(log_directives: &str) -> Result<EnvFilter, Error
8080
.add_directive(directive_to_allow_otel_trace))
8181
}
8282

83-
pub fn build_otel_layer<S>() -> Result<(OpenTelemetryLayer<S, Tracer>, TracingGuard), TraceError>
83+
pub fn build_otel_layer<S>() -> Result<(OpenTelemetryLayer<S, Tracer>, TracingGuard), Error>
8484
where
8585
S: Subscriber + for<'a> LookupSpan<'a>,
8686
{

0 commit comments

Comments
 (0)