Skip to content

Commit f6cd4f3

Browse files
bobrikTheJokr
authored andcommitted
Bump tonic to v0.14 and opentelemetry to v0.31
This lets us deduplicate dependencies downstream.
1 parent b692969 commit f6cd4f3

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,17 @@ darling = "0.21"
3636
erased-serde = "0.4"
3737
futures-util = "0.3"
3838
governor = "0.6"
39-
http = "1"
39+
http = "1.1.0"
4040
http-body-util = "0.1"
4141
hyper = { version = "1", default-features = false }
4242
hyper-util = { version = "0.1", default-features = false }
4343
indexmap = "2.0"
4444
ipnetwork = { version = "0.21", features = ["serde"] }
4545
libc = "0.2"
4646
once_cell = "1.5"
47-
tonic = { version = "0.13", default-features = false }
48-
opentelemetry-proto = "0.30"
47+
tonic = { version = "0.14", default-features = false }
48+
tonic-prost = { version = "0.14" }
49+
opentelemetry-proto = "0.31"
4950
parking_lot = "0.12"
5051
pin-project-lite = "0.2.16"
5152
proc-macro2 = { version = "1", default-features = false }

foundations/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ telemetry-server = [
8989
]
9090

9191
# Enables telemetry reporting over gRPC
92-
telemetry-otlp-grpc = ["dep:tonic", "tonic/prost", "dep:tokio", "tokio/net", "dep:hyper"]
92+
telemetry-otlp-grpc = ["dep:tonic", "dep:tonic-prost", "dep:tokio", "tokio/net", "dep:hyper"]
9393

9494
# Enables experimental tokio runtime metrics
9595
tokio-runtime-metrics = [
@@ -219,6 +219,7 @@ tracing-slog = { workspace = true, optional = true }
219219
thread_local = { workspace = true, optional = true }
220220
tokio = { workspace = true, optional = true, features = ["sync", "rt", "macros"] }
221221
tonic = { workspace = true, optional = true, features = ["channel"] }
222+
tonic-prost = { workspace = true, optional = true }
222223
tikv-jemallocator = { workspace = true, optional = true, features = [
223224
"profiling",
224225
"stats",

foundations/src/telemetry/tracing/output_otlp_grpc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ use opentelemetry_proto::tonic::collector::trace::v1::{
1212
use opentelemetry_proto::tonic::trace::v1::ResourceSpans;
1313
use std::time::Duration;
1414
use tonic::client::Grpc;
15-
use tonic::codec::ProstCodec;
1615
use tonic::transport::Channel;
1716
use tonic::{GrpcMethod, Request};
17+
use tonic_prost::ProstCodec;
1818

1919
static COLLECTOR_PATH: &str = "/opentelemetry.proto.collector.trace.v1.TraceService/Export";
2020
static TRACE_SERVICE: &str = "opentelemetry.proto.collector.trace.v1.TraceService";

0 commit comments

Comments
 (0)