Use correct version of opentelemetry
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Valentin Brandl 2021-03-29 16:32:37 +02:00
parent cbdda8a561
commit 56b973607c
2 changed files with 27 additions and 90 deletions

113
Cargo.lock generated
View File

@ -17,8 +17,8 @@ dependencies = [
"futures-core", "futures-core",
"futures-sink", "futures-sink",
"log", "log",
"pin-project 0.4.27", "pin-project 0.4.28",
"tokio 0.2.25", "tokio",
"tokio-util", "tokio-util",
] ]
@ -123,7 +123,7 @@ dependencies = [
"futures-channel", "futures-channel",
"futures-util", "futures-util",
"smallvec", "smallvec",
"tokio 0.2.25", "tokio",
] ]
[[package]] [[package]]
@ -153,7 +153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"pin-project 0.4.27", "pin-project 0.4.28",
] ]
[[package]] [[package]]
@ -213,7 +213,7 @@ dependencies = [
"futures-sink", "futures-sink",
"futures-util", "futures-util",
"log", "log",
"pin-project 0.4.27", "pin-project 0.4.28",
"slab", "slab",
] ]
@ -281,15 +281,6 @@ dependencies = [
"serde 1.0.125", "serde 1.0.125",
] ]
[[package]]
name = "addr2line"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
dependencies = [
"gimli",
]
[[package]] [[package]]
name = "adler" name = "adler"
version = "1.0.2" version = "1.0.2"
@ -367,20 +358,6 @@ dependencies = [
"serde_urlencoded", "serde_urlencoded",
] ]
[[package]]
name = "backtrace"
version = "0.3.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc"
dependencies = [
"addr2line",
"cfg-if 1.0.0",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
]
[[package]] [[package]]
name = "badge" name = "badge"
version = "0.3.0" version = "0.3.0"
@ -891,12 +868,6 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "gimli"
version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
[[package]] [[package]]
name = "git2" name = "git2"
version = "0.13.17" version = "0.13.17"
@ -926,7 +897,7 @@ dependencies = [
"http", "http",
"indexmap", "indexmap",
"slab", "slab",
"tokio 0.2.25", "tokio",
"tokio-util", "tokio-util",
"tracing", "tracing",
"tracing-futures", "tracing-futures",
@ -980,7 +951,7 @@ dependencies = [
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"tempfile", "tempfile",
"tokio 0.2.25", "tokio",
"tracing", "tracing",
"tracing-actix-web", "tracing-actix-web",
"tracing-bunyan-formatter", "tracing-bunyan-formatter",
@ -1053,7 +1024,7 @@ dependencies = [
"itoa", "itoa",
"pin-project 1.0.5", "pin-project 1.0.5",
"socket2", "socket2",
"tokio 0.2.25", "tokio",
"tower-service", "tower-service",
"tracing", "tracing",
"want", "want",
@ -1068,7 +1039,7 @@ dependencies = [
"bytes 0.5.6", "bytes 0.5.6",
"hyper", "hyper",
"native-tls", "native-tls",
"tokio 0.2.25", "tokio",
"tokio-tls", "tokio-tls",
] ]
@ -1467,12 +1438,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]]
name = "object"
version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.7.0" version = "1.7.0"
@ -1534,8 +1499,6 @@ dependencies = [
"pin-project 1.0.5", "pin-project 1.0.5",
"rand 0.8.3", "rand 0.8.3",
"thiserror", "thiserror",
"tokio 1.4.0",
"tokio-stream",
] ]
[[package]] [[package]]
@ -1611,11 +1574,11 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
[[package]] [[package]]
name = "pin-project" name = "pin-project"
version = "0.4.27" version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f"
dependencies = [ dependencies = [
"pin-project-internal 0.4.27", "pin-project-internal 0.4.28",
] ]
[[package]] [[package]]
@ -1629,9 +1592,9 @@ dependencies = [
[[package]] [[package]]
name = "pin-project-internal" name = "pin-project-internal"
version = "0.4.27" version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1892,7 +1855,7 @@ dependencies = [
"pin-project-lite 0.2.4", "pin-project-lite 0.2.4",
"serde 1.0.125", "serde 1.0.125",
"serde_urlencoded", "serde_urlencoded",
"tokio 0.2.25", "tokio",
"tokio-tls", "tokio-tls",
"url", "url",
"wasm-bindgen", "wasm-bindgen",
@ -1930,12 +1893,6 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
[[package]]
name = "rustc-demangle"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
[[package]] [[package]]
name = "rustc_version" name = "rustc_version"
version = "0.2.3" version = "0.2.3"
@ -2366,27 +2323,6 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "tokio"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722"
dependencies = [
"autocfg",
"pin-project-lite 0.2.4",
]
[[package]]
name = "tokio-stream"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e177a5d8c3bf36de9ebe6d58537d8879e964332f93fb3339e43f618c81361af0"
dependencies = [
"futures-core",
"pin-project-lite 0.2.4",
"tokio 1.4.0",
]
[[package]] [[package]]
name = "tokio-tls" name = "tokio-tls"
version = "0.3.1" version = "0.3.1"
@ -2394,7 +2330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
dependencies = [ dependencies = [
"native-tls", "native-tls",
"tokio 0.2.25", "tokio",
] ]
[[package]] [[package]]
@ -2408,7 +2344,7 @@ dependencies = [
"futures-sink", "futures-sink",
"log", "log",
"pin-project-lite 0.1.11", "pin-project-lite 0.1.11",
"tokio 0.2.25", "tokio",
] ]
[[package]] [[package]]
@ -2557,12 +2493,12 @@ dependencies = [
[[package]] [[package]]
name = "trust-dns-proto" name = "trust-dns-proto"
version = "0.19.6" version = "0.19.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53861fcb288a166aae4c508ae558ed18b53838db728d4d310aad08270a7d4c2b" checksum = "1cad71a0c0d68ab9941d2fb6e82f8fb2e86d9945b94e1661dd0aaea2b88215a9"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"backtrace", "cfg-if 1.0.0",
"enum-as-inner", "enum-as-inner",
"futures", "futures",
"idna", "idna",
@ -2571,17 +2507,16 @@ dependencies = [
"rand 0.7.3", "rand 0.7.3",
"smallvec", "smallvec",
"thiserror", "thiserror",
"tokio 0.2.25", "tokio",
"url", "url",
] ]
[[package]] [[package]]
name = "trust-dns-resolver" name = "trust-dns-resolver"
version = "0.19.6" version = "0.19.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6759e8efc40465547b0dfce9500d733c65f969a4cbbfbe3ccf68daaa46ef179e" checksum = "710f593b371175db53a26d0b38ed2978fafb9e9e8d3868b1acd753ea18df0ceb"
dependencies = [ dependencies = [
"backtrace",
"cfg-if 0.1.10", "cfg-if 0.1.10",
"futures", "futures",
"ipconfig", "ipconfig",
@ -2591,7 +2526,7 @@ dependencies = [
"resolv-conf", "resolv-conf",
"smallvec", "smallvec",
"thiserror", "thiserror",
"tokio 0.2.25", "tokio",
"trust-dns-proto", "trust-dns-proto",
] ]

View File

@ -25,7 +25,9 @@ git2 = "0.13.17"
lazy_static = "1.4.0" lazy_static = "1.4.0"
number_prefix = "0.4.0" number_prefix = "0.4.0"
openssl-probe = "0.1.2" openssl-probe = "0.1.2"
opentelemetry = { version = "0.12.0", default-features = false, features = ["trace", "tokio-support"] } # TODO: upgrade
opentelemetry = { version = "0.12.0", default-features = false, features = ["trace"] }
# TODO: upgrade
opentelemetry-jaeger = "0.11.0" opentelemetry-jaeger = "0.11.0"
reqwest = "0.10.10" reqwest = "0.10.10"
serde = "1.0.125" serde = "1.0.125"