Merge branch 'main' into sync-flush

Author: cijothomas

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 }

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

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