Skip to content
Merged
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
7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,17 @@ darling = "0.21"
erased-serde = "0.4"
futures-util = "0.3"
governor = "0.6"
http = "1"
http = "1.1.0"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

http-body-util = "0.1"
hyper = { version = "1", default-features = false }
hyper-util = { version = "0.1", default-features = false }
indexmap = "2.0"
ipnetwork = { version = "0.21", features = ["serde"] }
libc = "0.2"
once_cell = "1.5"
tonic = { version = "0.13", default-features = false }
opentelemetry-proto = "0.30"
tonic = { version = "0.14", default-features = false }
tonic-prost = { version = "0.14" }
opentelemetry-proto = "0.31"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

parking_lot = "0.12"
pin-project-lite = "0.2.16"
proc-macro2 = { version = "1", default-features = false }
Expand Down
3 changes: 2 additions & 1 deletion foundations/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ telemetry-server = [
]

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

# Enables experimental tokio runtime metrics
tokio-runtime-metrics = [
Expand Down Expand Up @@ -219,6 +219,7 @@ tracing-slog = { workspace = true, optional = true }
thread_local = { workspace = true, optional = true }
tokio = { workspace = true, optional = true, features = ["sync", "rt", "macros"] }
tonic = { workspace = true, optional = true, features = ["channel"] }
tonic-prost = { workspace = true, optional = true }
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 @@ -12,9 +12,9 @@ use opentelemetry_proto::tonic::collector::trace::v1::{
use opentelemetry_proto::tonic::trace::v1::ResourceSpans;
use std::time::Duration;
use tonic::client::Grpc;
use tonic::codec::ProstCodec;
use tonic::transport::Channel;
use tonic::{GrpcMethod, Request};
use tonic_prost::ProstCodec;

static COLLECTOR_PATH: &str = "/opentelemetry.proto.collector.trace.v1.TraceService/Export";
static TRACE_SERVICE: &str = "opentelemetry.proto.collector.trace.v1.TraceService";
Expand Down
Loading