diff --git a/Cargo.lock b/Cargo.lock index 156fe1f..dca183d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -676,6 +676,21 @@ dependencies = [ "winapi", ] +[[package]] +name = "futures" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + [[package]] name = "futures-channel" version = "0.3.17" @@ -683,6 +698,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -702,6 +718,12 @@ dependencies = [ "futures-util", ] +[[package]] +name = "futures-io" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" + [[package]] name = "futures-macro" version = "0.3.17" @@ -734,10 +756,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" dependencies = [ "autocfg", + "futures-channel", "futures-core", + "futures-io", "futures-macro", "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", "proc-macro-hack", @@ -1225,13 +1250,12 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "opentelemetry" version = "0.16.0" -source = "git+https://github.com/asonix/opentelemetry-rust?branch=asonix/limit-futures-deps#e1734e3fe6c3610dca54308d4b545753a67997c3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf9b1c4e9a6c4de793c632496fa490bdc0e1eea73f0c91394f7b6990935d22" dependencies = [ "async-trait", "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", + "futures", "js-sys", "lazy_static", "percent-encoding", @@ -1245,10 +1269,11 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" version = "0.9.0" -source = "git+https://github.com/asonix/opentelemetry-rust?branch=asonix/limit-futures-deps#e1734e3fe6c3610dca54308d4b545753a67997c3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f19d4b43842433c420c548c985d158f5628bba5b518e0be64627926d19889992" dependencies = [ "async-trait", - "futures-core", + "futures", "http", "opentelemetry", "prost", diff --git a/Cargo.toml b/Cargo.toml index c05dbb5..9100297 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,8 +29,8 @@ futures-util = "0.3.17" mime = "0.3.1" num_cpus = "1.13" once_cell = "1.4.0" -opentelemetry = { version = "0.16", features = ["rt-tokio"], git = "https://github.com/asonix/opentelemetry-rust", branch = "asonix/limit-futures-deps" } -opentelemetry-otlp = { version = "0.9", git = "https://github.com/asonix/opentelemetry-rust", branch = "asonix/limit-futures-deps" } +opentelemetry = { version = "0.16", features = ["rt-tokio"] } +opentelemetry-otlp = "0.9" pin-project-lite = "0.2.7" reqwest = { version = "0.11.5", default-features = false, features = ["stream"], optional = true} rust-s3 = { version = "0.27.0", default-features = false, features = ["tokio-rustls-tls"], optional = true, git = "https://github.com/asonix/rust-s3", branch = "asonix/main" } @@ -63,7 +63,3 @@ features = ["emit_event_on_error", "opentelemetry_0_16"] version = "0.1.0-beta.7" default-features = false features = ["emit_event_on_error", "opentelemetry_0_16"] - -[patch.crates-io] -opentelemetry = { git = "https://github.com/asonix/opentelemetry-rust", branch = "asonix/limit-futures-deps" } -opentelemetry-otlp = { git = "https://github.com/asonix/opentelemetry-rust", branch = "asonix/limit-futures-deps" }