Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump tonic dependency to v0.12 #98

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = [
"foundations",
"foundations-macros",
"examples",
"tools/gen-syscall-enum"
"tools/gen-syscall-enum",
]
resolver = "2"

Expand Down Expand Up @@ -36,12 +36,13 @@ darling = "0.20.10"
erased-serde = "0.3.28"
futures-util = "0.3.28"
governor = "0.6"
http = "1"
hyper = { version = "0.14", default-features = false }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be bumped to 1.5.1 as well?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind. This is done in #100.

indexmap = "2.0.0"
ipnetwork = "0.20"
once_cell = "1.5"
tonic = { version = "0.11.0", default-features = false }
opentelemetry-proto = "0.5.0"
tonic = { version = "0.12.0", default-features = false }
opentelemetry-proto = "0.27.0"
parking_lot = "0.12.1"
proc-macro2 = { version = "1", default-features = false }
prometheus = { version = "0.13.3", default-features = false }
Expand All @@ -52,7 +53,7 @@ percent-encoding = "2.3.1"
quote = "1"
regex = "1.8"
reqwest = { version = "0.12", default-features = false }
socket2 = { version = "0.5.3", features = [ "all" ] }
socket2 = { version = "0.5.3", features = ["all"] }
syn = "2"
serde = "1"
serde_path_to_error = "0.1.15"
Expand Down
4 changes: 3 additions & 1 deletion foundations/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ tracing = [
"dep:futures-util",
"dep:tokio",
"dep:serde",
"dep:http",
]

# Enables metrics functionality.
Expand Down Expand Up @@ -177,6 +178,7 @@ clap = { workspace = true, optional = true }
erased-serde = { workspace = true, optional = true }
futures-util = { workspace = true, optional = true }
governor = { workspace = true, optional = true }
http = { workspace = true, optional = true }
hyper = { workspace = true, optional = true, features = [
"http1",
"runtime",
Expand All @@ -203,7 +205,7 @@ slog-term = { workspace = true, optional = true }
socket2 = { workspace = true, optional = true }
thread_local = { workspace = true, optional = true }
tokio = { workspace = true, optional = true, features = ["sync", "rt"] }
tonic = { workspace = true, optional = true, features = ["channel", "transport"] }
tonic = { workspace = true, optional = true, features = ["channel", "prost"] }
tikv-jemallocator = { workspace = true, optional = true, features = [
"profiling",
"stats",
Expand Down
2 changes: 1 addition & 1 deletion foundations/src/telemetry/tracing/output_otlp_grpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::{BootstrapResult, ServiceInfo};
use anyhow::Context as _;
use cf_rustracing_jaeger::span::SpanReceiver;
use futures_util::future::{BoxFuture, FutureExt as _};
use hyper::http::uri::PathAndQuery;
use http::uri::PathAndQuery;
use opentelemetry_proto::tonic::collector::trace::v1::{
ExportTraceServiceRequest, ExportTraceServiceResponse,
};
Expand Down