diff --git a/Cargo.lock b/Cargo.lock index 6d6020fbdc..12a44c0ee9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ dependencies = [ "tracing", "tracing-futures", "tracing-opentelemetry", - "tracing-subscriber 0.2.25", + "tracing-subscriber", "typed-builder", "url", "uuid", @@ -132,7 +132,7 @@ dependencies = [ "once_cell", "serde_json", "tokio", - "tracing-subscriber 0.3.2", + "tracing-subscriber", ] [[package]] @@ -158,7 +158,7 @@ dependencies = [ "tokio", "tracing", "tracing-futures", - "tracing-subscriber 0.2.25", + "tracing-subscriber", "typed-builder", ] @@ -584,18 +584,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "winapi 0.3.9", -] - [[package]] name = "clap" version = "2.33.3" @@ -1809,15 +1797,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" -[[package]] -name = "matchers" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" -dependencies = [ - "regex-automata", -] - [[package]] name = "matchers" version = "0.1.0" @@ -2040,16 +2019,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.14" @@ -2700,9 +2669,9 @@ dependencies = [ [[package]] name = "reqwest-tracing" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8682dfc3dd07b8e66a596056061fc91431d2c5ba62658490b792976ad1d1558f" +checksum = "89af431b8c46776b5071a9a739c2b5fadbed6be2c6158d1ac5f71c4da3d2261c" dependencies = [ "async-trait", "opentelemetry", @@ -3557,15 +3526,15 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599f388ecb26b28d9c1b2e4437ae019a7b336018b45ed911458cd9ebf91129f6" +checksum = "3ffbf13a0f8b054a4e59df3a173b818e9c6177c02789871f2073977fd0062076" dependencies = [ "opentelemetry", "tracing", "tracing-core", "tracing-log", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] @@ -3578,28 +3547,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-subscriber" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "ansi_term 0.12.1", - "chrono", - "lazy_static", - "matchers 0.0.1", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", - "tracing-serde", -] - [[package]] name = "tracing-subscriber" version = "0.3.2" @@ -3608,7 +3555,7 @@ checksum = "7507ec620f809cdf07cccb5bc57b13069a88031b795efd4079b1c71b66c1613d" dependencies = [ "ansi_term 0.12.1", "lazy_static", - "matchers 0.1.0", + "matchers", "regex", "serde", "serde_json", diff --git a/apollo-router-core/Cargo.toml b/apollo-router-core/Cargo.toml index 56ebb02c2a..19bd6a8c45 100644 --- a/apollo-router-core/Cargo.toml +++ b/apollo-router-core/Cargo.toml @@ -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 -tracing-subscriber = { version = "0.2.25", default-features = false, features = [ +tracing-subscriber = { version = "0.3", default-features = false, features = [ "env-filter", "fmt", ] } diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index 06e2088a14..7e9b543b89 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -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" @@ -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"] } @@ -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", ] } diff --git a/licenses.html b/licenses.html index 650ac9898b..781b959f92 100644 --- a/licenses.html +++ b/licenses.html @@ -4215,7 +4215,6 @@

Used by:

  • miow
  • multimap
  • net2
  • -
  • num-integer
  • num-traits
  • num_cpus
  • once_cell
  • @@ -6591,7 +6590,6 @@

    Apache License 2.0

    Used by: