From 067bb980af05312a0b042de79d065555aca59eca Mon Sep 17 00:00:00 2001 From: tison Date: Fri, 14 Feb 2025 21:02:47 +0800 Subject: [PATCH 1/2] build: drop unused tonic server deps Signed-off-by: tison --- opentelemetry-proto/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-proto/Cargo.toml b/opentelemetry-proto/Cargo.toml index 1213d48a5b..64ebf81d7d 100644 --- a/opentelemetry-proto/Cargo.toml +++ b/opentelemetry-proto/Cargo.toml @@ -33,7 +33,7 @@ default = ["full"] full = ["gen-tonic", "trace", "logs", "metrics", "zpages", "with-serde", "internal-logs"] # crates used to generate rs files -gen-tonic = ["gen-tonic-messages", "tonic/transport"] +gen-tonic = ["gen-tonic-messages", "tonic/channel"] gen-tonic-messages = ["tonic", "prost"] # telemetry pillars and functions From 243445df826349963758bd1f099f5d1fb673e25d Mon Sep 17 00:00:00 2001 From: tison Date: Fri, 14 Feb 2025 21:21:13 +0800 Subject: [PATCH 2/2] fixup test compilation Signed-off-by: tison --- examples/tracing-grpc/Cargo.toml | 2 +- opentelemetry-otlp/Cargo.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/tracing-grpc/Cargo.toml b/examples/tracing-grpc/Cargo.toml index c836904a37..1f3ade0c87 100644 --- a/examples/tracing-grpc/Cargo.toml +++ b/examples/tracing-grpc/Cargo.toml @@ -19,7 +19,7 @@ opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"] opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["trace"] } prost = { workspace = true } tokio = { workspace = true, features = ["full"] } -tonic = { workspace = true } +tonic = { workspace = true, features = ["server"] } [build-dependencies] tonic-build = { workspace = true } diff --git a/opentelemetry-otlp/Cargo.toml b/opentelemetry-otlp/Cargo.toml index 35f270c6ce..b202b23013 100644 --- a/opentelemetry-otlp/Cargo.toml +++ b/opentelemetry-otlp/Cargo.toml @@ -51,6 +51,7 @@ opentelemetry_sdk = { features = ["trace", "rt-tokio", "testing"], path = "../op tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } futures-util = { workspace = true } temp-env = { workspace = true } +tonic = { workspace = true, features = ["server"] } [features] # telemetry pillars and functions