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.

Sign up for GitHub

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

Jump to bottom

Update tonic, prost, and friends #660

Merged
merged 4 commits into from Jan 10, 2022
Merged

Update tonic, prost, and friends #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
682f6df
Update tonic, prost, and friends
davidpdrsn Oct 26, 2021
777ed84
Patch tonic to `master` which uses 2018 edition
davidpdrsn Dec 7, 2021
2d16842
remove patch now that tonic is released
davidpdrsn Dec 9, 2021
d22fdf9
format
davidpdrsn Dec 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/external-otlp-tonic-tokio/Cargo.toml
View file
Open in desktop
Expand Up @@ -9,5 +9,5 @@ opentelemetry = { path = "../../opentelemetry", features = ["rt-tokio", "metrics
opentelemetry-otlp = { path = "../../opentelemetry-otlp", features = ["tonic", "tls", "tls-roots"] }
serde_json = "1.0"
tokio = { version = "1.0", features = ["full"] }
tonic = "0.5.0"
tonic = "0.6.2"
url = "2.2.0"
6 changes: 3 additions & 3 deletions examples/grpc/Cargo.toml
View file
Open in desktop
Expand Up @@ -16,11 +16,11 @@ doc = false

[dependencies]
http = "0.2"
tonic = "0.5"
prost = "0.8"
tonic = "0.6.2"
prost = "0.9"
tokio = { version = "1.0", features = ["full"] }
opentelemetry = { path = "../../opentelemetry" }
opentelemetry-jaeger = { path = "../../opentelemetry-jaeger" }

[build-dependencies]
tonic-build = "0.5"
tonic-build = "0.6.2"
6 changes: 3 additions & 3 deletions examples/tracing-grpc/Cargo.toml
View file
Open in desktop
Expand Up @@ -14,8 +14,8 @@ path = "src/client.rs"

[dependencies]
http = "0.2"
tonic = "0.5"
prost = "0.8"
tonic = "0.6.2"
prost = "0.9"
tokio = { version = "1.0", features = ["full"] }
opentelemetry = { version = "0.14", features = ["rt-tokio"] }
opentelemetry-jaeger = "0.13"
Expand All @@ -25,4 +25,4 @@ tracing-opentelemetry = "0.13"
tracing-futures = "0.2"

[build-dependencies]
tonic-build = "0.5"
tonic-build = "0.6.2"
8 changes: 4 additions & 4 deletions opentelemetry-otlp/Cargo.toml
View file
Open in desktop
Expand Up @@ -40,10 +40,10 @@ futures = { version = "0.3", default-features = false, features = ["std"] }
futures-util = { version = "0.3", default-features = false, features = ["std"] }
grpcio = { version = "0.9", optional = true }
opentelemetry = { version = "0.16", default-features = false, features = ["trace"], path = "../opentelemetry" }
prost = { version = "0.8", optional = true }
prost = { version = "0.9", optional = true }
protobuf = { version = "2.18", optional = true }
thiserror = "1.0"
tonic = { version = "0.5", optional = true }
tonic = { version = "0.6.2", optional = true }
tokio = { version = "1.0", features = ["full"], optional = true }
opentelemetry-http = { version = "0.5", path = "../opentelemetry-http", optional = true }
reqwest = { version = "0.11", optional = true, default-features = false }
Expand Down Expand Up @@ -80,5 +80,5 @@ reqwest-rustls = ["reqwest", "reqwest/rustls-tls-native-roots"]
surf-client = ["surf", "opentelemetry-http/surf"]

[build-dependencies]
tonic-build = { version = "0.5", default-features = false, features = ["transport", "prost"], optional = true }
prost-build = {version = "0.8", optional = true }
tonic-build = { version = "0.6.2", default-features = false, features = ["transport", "prost"], optional = true }
prost-build = { version = "0.9", optional = true }
8 changes: 2 additions & 6 deletions opentelemetry-otlp/src/metric.rs
View file
Open in desktop
Expand Up @@ -274,14 +274,10 @@ impl MetricsExporter {
None => endpoint,
}
.timeout(config.timeout)
.connect_lazy()
.map_err::<crate::Error, _>(Into::into)?;
.connect_lazy();

#[cfg(not(feature = "tls"))]
let channel = endpoint
.timeout(config.timeout)
.connect_lazy()
.map_err::<crate::Error, _>(Into::into)?;
let channel = endpoint.timeout(config.timeout).connect_lazy();

let client = MetricsServiceClient::new(channel);

Expand Down
4 changes: 2 additions & 2 deletions opentelemetry-otlp/src/span.rs
View file
Open in desktop
Expand Up @@ -338,10 +338,10 @@ impl SpanExporter {
None => endpoint,
}
.timeout(config.timeout)
.connect_lazy()?;
.connect_lazy();

#[cfg(not(feature = "tls"))]
let channel = endpoint.timeout(config.timeout).connect_lazy()?;
let channel = endpoint.timeout(config.timeout).connect_lazy();

SpanExporter::from_tonic_channel(config, tonic_config, channel)
}
Expand Down
8 changes: 4 additions & 4 deletions opentelemetry-stackdriver/Cargo.toml
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[build-dependencies]
tonic-build = "0.5.0"
tonic-build = "0.6.2"
which = "4.0.2"

[dependencies]
Expand All @@ -24,10 +24,10 @@ hyper = "0.14.2"
hyper-rustls = { version = "0.22.1", optional = true }
log = "0.4"
opentelemetry = { version = "0.16", path = "../opentelemetry" }
prost = "0.8"
prost-types = "0.8"
prost = "0.9"
prost-types = "0.9"
rustls = "0.19"
tonic = { version = "0.5", features = ["tls", "transport"] }
tonic = { version = "0.6.2", features = ["tls", "transport"] }
tokio = { version = "1.1", optional = true }
yup-oauth2 = { version = "5.0.1", optional = true }
webpki-roots = "0.21"
Expand Down