Skip to content

Commit ceae72d

Browse files
committed
Fix broken test
Signed-off-by: Ryan Levick <ryan.levick@fermyon.com>
1 parent 308b7c5 commit ceae72d

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

crates/telemetry/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ http0 = { version = "0.2.9", package = "http" }
1010
http1 = { version = "1.0.0", package = "http" }
1111
opentelemetry = { workspace = true }
1212
opentelemetry-appender-tracing = "0.28"
13-
opentelemetry-otlp = { version = "0.28", features = ["http-proto", "http", "reqwest-client", "grpc-tonic"] }
13+
opentelemetry-otlp = { version = "0.28", features = ["grpc-tonic"] }
1414
opentelemetry_sdk = { workspace = true }
1515
terminal = { path = "../terminal" }
1616
tracing = { workspace = true }

crates/telemetry/src/lib.rs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::io::IsTerminal;
22

3+
use anyhow::Context;
34
use env::otel_logs_enabled;
45
use env::otel_metrics_enabled;
56
use env::otel_tracing_enabled;
@@ -65,13 +66,19 @@ pub fn init(spin_version: String) -> anyhow::Result<()> {
6566
);
6667

6768
let otel_tracing_layer = if otel_tracing_enabled() {
68-
Some(traces::otel_tracing_layer(spin_version.clone())?)
69+
Some(
70+
traces::otel_tracing_layer(spin_version.clone())
71+
.context("failed to initialize otel tracing")?,
72+
)
6973
} else {
7074
None
7175
};
7276

7377
let otel_metrics_layer = if otel_metrics_enabled() {
74-
Some(metrics::otel_metrics_layer(spin_version.clone())?)
78+
Some(
79+
metrics::otel_metrics_layer(spin_version.clone())
80+
.context("failed to initialize otel metrics")?,
81+
)
7582
} else {
7683
None
7784
};
@@ -88,7 +95,8 @@ pub fn init(spin_version: String) -> anyhow::Result<()> {
8895
opentelemetry::global::set_text_map_propagator(TraceContextPropagator::new());
8996

9097
if otel_logs_enabled() {
91-
logs::init_otel_logging_backend(spin_version)?;
98+
logs::init_otel_logging_backend(spin_version)
99+
.context("failed to initialize otel logging")?;
92100
}
93101

94102
Ok(())

0 commit comments

Comments
 (0)