Skip to content

Commit

Permalink
rollback tracing-opentelemetry and tracing-subscriber updates
Browse files Browse the repository at this point in the history
reqwest-tracing still requires tracing-opentelemetry 0.15, so tracing
headers do not get propagated if the versions are different
  • Loading branch information
Geoffroy Couprie authored and Geal committed Nov 30, 2021
1 parent 92f3f82 commit 6d18ef2
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 24 deletions.
65 changes: 47 additions & 18 deletions Cargo.lock

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

3 changes: 2 additions & 1 deletion apollo-router-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ mockall = "0.10.2"
static_assertions = "1"
test-log = { version = "0.2.8", default-features = false, features = ["trace"] }
tokio = { version = "1", features = ["full"] }
tracing-subscriber = { version = "0.3.2", default-features = false, features = [
# don't bump to 0.3 until we bump tracing-opentelemetry to 0.16
tracing-subscriber = { version = "0.2.25", default-features = false, features = [
"env-filter",
"fmt",
] }
9 changes: 6 additions & 3 deletions apollo-router/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,11 @@ tokio = { version = "1.14.0", features = ["full"] }
tonic = { version = "0.5.2", optional = true }
tracing = "0.1.29"
tracing-futures = "0.2.5"
tracing-opentelemetry = "0.16.0"
tracing-subscriber = { version = "0.3.2", features = ["json"] }
# 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"] }

typed-builder = "0.9.1"
url = { version = "2.2.2", features = ["serde"] }
warp = { version = "0.3.2", default-features = false, features = [
Expand All @@ -73,7 +76,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.3.2", default-features = false, features = [
tracing-subscriber = { version = "0.2.25", default-features = false, features = [
"env-filter",
"fmt",
] }
Expand Down
4 changes: 2 additions & 2 deletions licenses.html
Original file line number Diff line number Diff line change
Expand Up @@ -4215,6 +4215,7 @@ <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 @@ -6590,6 +6591,7 @@ <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 Expand Up @@ -7821,10 +7823,8 @@ <h4>Used by:</h4>
<li><a href=" https://github.com/tokio-rs/tracing ">tracing-futures</a></li>
<li><a href=" https://github.com/tokio-rs/tracing ">tracing-log</a></li>
<li><a href=" https://github.com/tokio-rs/tracing ">tracing-opentelemetry</a></li>
<li><a href=" https://github.com/tokio-rs/tracing ">tracing-opentelemetry</a></li>
<li><a href=" https://github.com/tokio-rs/tracing ">tracing-serde</a></li>
<li><a href=" https://github.com/tokio-rs/tracing ">tracing-subscriber</a></li>
<li><a href=" https://github.com/tokio-rs/tracing ">tracing-subscriber</a></li>
</ul>
<pre class="license-text">Copyright (c) 2019 Tokio Contributors

Expand Down

0 comments on commit 6d18ef2

Please sign in to comment.