Skip to content

Commit eb1f401

Browse files
bobrikfisherdarling
authored andcommitted
Bump tonic dependency to v0.12
1 parent ccbdef2 commit eb1f401

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ members = [
33
"foundations",
44
"foundations-macros",
55
"examples",
6-
"tools/gen-syscall-enum"
6+
"tools/gen-syscall-enum",
77
]
88
resolver = "2"
99

@@ -36,13 +36,15 @@ darling = "0.20.10"
3636
erased-serde = "0.3.28"
3737
futures-util = "0.3.28"
3838
governor = "0.6"
39+
3940
http-body-util = "0.1"
4041
hyper = { version = "1", default-features = false }
4142
hyper-util = { version = "0.1", default-features = false }
4243
indexmap = "2.0.0"
4344
ipnetwork = "0.20"
4445
libc = "0.2"
4546
once_cell = "1.5"
47+
http = { workspace = true, optional = true }
4648
tonic = { version = "0.12", default-features = false }
4749
opentelemetry-proto = "0.7"
4850
parking_lot = "0.12.1"
@@ -55,7 +57,7 @@ percent-encoding = "2.3.1"
5557
quote = "1"
5658
regex = "1.8"
5759
reqwest = { version = "0.12", default-features = false }
58-
socket2 = { version = "0.5.3", features = [ "all" ] }
60+
socket2 = { version = "0.5.3", features = ["all"] }
5961
syn = "2"
6062
serde = "1"
6163
serde_path_to_error = "0.1.15"

foundations/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ tracing = [
126126
"dep:serde",
127127
"dep:slab",
128128
"dep:libc",
129+
"dep:http",
129130
]
130131

131132
# Enables metrics functionality.
@@ -213,7 +214,7 @@ socket2 = { workspace = true, optional = true }
213214
tracing-slog = { workspace = true, optional = true }
214215
thread_local = { workspace = true, optional = true }
215216
tokio = { workspace = true, optional = true, features = ["sync", "rt"] }
216-
tonic = { workspace = true, optional = true, features = ["channel", "transport"] }
217+
tonic = { workspace = true, optional = true, features = ["channel", "prost"] }
217218
tikv-jemallocator = { workspace = true, optional = true, features = [
218219
"profiling",
219220
"stats",

foundations/src/telemetry/tracing/output_otlp_grpc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::{BootstrapResult, ServiceInfo};
55
use anyhow::Context as _;
66
use cf_rustracing_jaeger::span::SpanReceiver;
77
use futures_util::future::{BoxFuture, FutureExt as _};
8-
use hyper::http::uri::PathAndQuery;
8+
use http::uri::PathAndQuery;
99
use opentelemetry_proto::tonic::collector::trace::v1::{
1010
ExportTraceServiceRequest, ExportTraceServiceResponse,
1111
};

0 commit comments

Comments
 (0)