diff --git a/Cargo.toml b/Cargo.toml index a07d002..77577c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = [ "foundations", "foundations-macros", "examples", - "tools/gen-syscall-enum" + "tools/gen-syscall-enum", ] resolver = "2" @@ -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 } 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 } @@ -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" diff --git a/foundations/Cargo.toml b/foundations/Cargo.toml index e27f91b..26ab642 100644 --- a/foundations/Cargo.toml +++ b/foundations/Cargo.toml @@ -121,6 +121,7 @@ tracing = [ "dep:futures-util", "dep:tokio", "dep:serde", + "dep:http", ] # Enables metrics functionality. @@ -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", @@ -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", diff --git a/foundations/src/telemetry/tracing/output_otlp_grpc.rs b/foundations/src/telemetry/tracing/output_otlp_grpc.rs index db5ce65..09d6887 100644 --- a/foundations/src/telemetry/tracing/output_otlp_grpc.rs +++ b/foundations/src/telemetry/tracing/output_otlp_grpc.rs @@ -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, };