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

update reqwest-tracing #222

Merged
merged 1 commit into from
Dec 1, 2021
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
71 changes: 9 additions & 62 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apollo-router-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static_assertions = "1"
test-log = { version = "0.2.8", default-features = false, features = ["trace"] }
tokio = { version = "1", features = ["full"] }
# don't bump to 0.3 until we bump tracing-opentelemetry to 0.16
Copy link
Contributor

Choose a reason for hiding this comment

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

You can ditch the note then XD

tracing-subscriber = { version = "0.2.25", default-features = false, features = [
tracing-subscriber = { version = "0.3", default-features = false, features = [
"env-filter",
"fmt",
] }
10 changes: 4 additions & 6 deletions apollo-router/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ opentelemetry-otlp = { version = "0.9.0", default-features = false, features = [
], optional = true }
reqwest = { version = "0.11.6", features = ["json", "stream"] }
reqwest-middleware = "0.1.2"
reqwest-tracing = { version = "0.1.3", features = ["opentelemetry_0_16"] }
reqwest-tracing = { version = "0.2", features = ["opentelemetry_0_16"] }
serde = { version = "1.0.130", features = ["derive", "rc"] }
serde_json = "1.0.72"
serde_yaml = "0.8.21"
Expand All @@ -58,10 +58,8 @@ tokio = { version = "1.14.0", features = ["full"] }
tonic = { version = "0.5.2", optional = true }
tracing = "0.1.29"
tracing-futures = "0.2.5"
# don't bump to 0.16 until reqwest-tracing does
tracing-opentelemetry = "0.15.0"
# don't bump to 0.3 until we bump tracing-opentelemetry to 0.16
tracing-subscriber = { version = "0.2.25", features = ["json"] }
tracing-opentelemetry = "0.16.0"
tracing-subscriber = { version = "0.3", features = ["json"] }

typed-builder = "0.9.1"
url = { version = "2.2.2", features = ["serde"] }
Expand All @@ -76,7 +74,7 @@ maplit = "1.0.2"
mockall = "0.10.2"
reqwest = { version = "0.11.6", features = ["json", "stream"] }
test-log = { version = "0.2.8", default-features = false, features = ["trace"] }
tracing-subscriber = { version = "0.2.25", default-features = false, features = [
tracing-subscriber = { version = "0.3", default-features = false, features = [
"env-filter",
"fmt",
] }
Expand Down
2 changes: 0 additions & 2 deletions licenses.html
Original file line number Diff line number Diff line change
Expand Up @@ -4215,7 +4215,6 @@ <h4>Used by:</h4>
<li><a href=" https://github.com/yoshuawuyts/miow ">miow</a></li>
<li><a href=" https://github.com/havarnov/multimap ">multimap</a></li>
<li><a href=" https://github.com/deprecrated/net2-rs ">net2</a></li>
<li><a href=" https://github.com/rust-num/num-integer ">num-integer</a></li>
<li><a href=" https://github.com/rust-num/num-traits ">num-traits</a></li>
<li><a href=" https://github.com/seanmonstar/num_cpus ">num_cpus</a></li>
<li><a href=" https://github.com/matklad/once_cell ">once_cell</a></li>
Expand Down Expand Up @@ -6591,7 +6590,6 @@ <h3 id="Apache-2.0">Apache License 2.0</h3>
<h4>Used by:</h4>
<ul class="license-used-by">
<li><a href=" https://crates.io/crates/apollo-parser ">apollo-parser</a></li>
<li><a href=" https://github.com/chronotope/chrono ">chrono</a></li>
<li><a href=" https://github.com/tokio-rs/prost ">prost-build</a></li>
<li><a href=" https://github.com/tokio-rs/prost ">prost-derive</a></li>
<li><a href=" https://github.com/tokio-rs/prost ">prost-types</a></li>
Expand Down