Skip to content

Commit a58c1a9

Browse files
committed
fix(deps): missing tonic dependency on tls
FIX #234
1 parent 079806c commit a58c1a9

File tree

4 files changed

+45
-2
lines changed

4 files changed

+45
-2
lines changed

examples/bug_234_tls/Cargo.toml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
[package]
2+
name = "bug_234_tls"
3+
version = "0.1.0"
4+
edition = "2021"
5+
authors.workspace = true
6+
license.workspace = true
7+
homepage.workspace = true
8+
repository.workspace = true
9+
rust-version.workspace = true
10+
11+
[dependencies]
12+
axum = { workspace = true, default-features = true }
13+
axum-tracing-opentelemetry = { path = "../../axum-tracing-opentelemetry" }
14+
tokio = { version = "1", features = ["full"] }
15+
tracing = { version = "0.1", features = ["log"] }
16+
tracing-subscriber = { version = "0.3.19", features = ["env-filter", "std"] }
17+
init-tracing-opentelemetry = { path = "../../init-tracing-opentelemetry", features = [
18+
"otlp",
19+
"tracing_subscriber_ext",
20+
"tls",
21+
] }
22+
tracing-opentelemetry-instrumentation-sdk = { path = "../../tracing-opentelemetry-instrumentation-sdk", features = [
23+
"http",
24+
] }
25+
# opentelemetry = { version = "0.29.1", features = ["metrics"] }

examples/bug_234_tls/src/main.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
use axum::{response::Html, routing::get, Router};
2+
3+
#[tokio::main]
4+
async fn main() {
5+
// build our application with a route
6+
let app = Router::new().route("/", get(handler));
7+
8+
// run it
9+
let listener = tokio::net::TcpListener::bind("127.0.0.1:3000")
10+
.await
11+
.unwrap();
12+
println!("listening on {}", listener.local_addr().unwrap());
13+
axum::serve(listener, app).await.unwrap();
14+
}
15+
16+
async fn handler() -> Html<&'static str> {
17+
Html("<h1>Hello, World!</h1>")
18+
}

init-tracing-opentelemetry/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +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 = ["opentelemetry-otlp/tls"]
73+
tls = ["opentelemetry-otlp/tls", "tonic"]
7474
tls-roots = ["opentelemetry-otlp/tls-roots"]
7575
tls-webpki-roots = ["opentelemetry-otlp/tls-webpki-roots"]
7676
logfmt = ["dep:tracing-logfmt"]

init-tracing-opentelemetry/src/otlp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ where
2626
Some("grpc/tls") => Some(
2727
SpanExporter::builder()
2828
.with_tonic()
29-
.with_tls_config(ClientTlsConfig::new().with_native_roots())
29+
.with_tls_config(ClientTlsConfig::new().with_enabled_roots())
3030
.build()?,
3131
),
3232
Some("grpc") => Some(SpanExporter::builder().with_tonic().build()?),

0 commit comments

Comments
 (0)