diff --git a/Cargo.lock b/Cargo.lock index e142ae7..c724694 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -344,7 +344,7 @@ dependencies = [ "futures", "hamming", "lazy_static", - "opentelemetry 0.18.0", + "opentelemetry", "opentelemetry-jaeger", "prometheus", "serde", @@ -354,7 +354,7 @@ dependencies = [ "tokio", "tracing", "tracing-actix-web", - "tracing-opentelemetry 0.18.0", + "tracing-opentelemetry", "tracing-subscriber", "tracing-unwrap", ] @@ -363,15 +363,16 @@ dependencies = [ name = "bkapi-client" version = "0.1.0" dependencies = [ + "async-nats", "futures", - "opentelemetry 0.17.0", + "opentelemetry", "opentelemetry-http", "reqwest", "serde", "serde_json", "tokio", "tracing", - "tracing-opentelemetry 0.17.4", + "tracing-opentelemetry", ] [[package]] @@ -1408,25 +1409,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "opentelemetry" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "js-sys", - "lazy_static", - "percent-encoding", - "pin-project", - "rand", - "thiserror", -] - [[package]] name = "opentelemetry" version = "0.18.0" @@ -1439,14 +1421,14 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449048140ee61e28f57abe6e9975eedc1f3a29855c7407bd6c12b18578863379" +checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" dependencies = [ "async-trait", "bytes", "http", - "opentelemetry 0.17.0", + "opentelemetry_api", ] [[package]] @@ -1459,7 +1441,7 @@ dependencies = [ "futures", "futures-executor", "once_cell", - "opentelemetry 0.18.0", + "opentelemetry", "opentelemetry-semantic-conventions", "thiserror", "thrift", @@ -1472,7 +1454,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb" dependencies = [ - "opentelemetry 0.18.0", + "opentelemetry", ] [[package]] @@ -2535,10 +2517,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee7247a77b494ee07bda43bce40a33e76f885662f11b3dda9894ecfdbe31fa06" dependencies = [ "actix-web", - "opentelemetry 0.17.0", + "opentelemetry", "pin-project", "tracing", - "tracing-opentelemetry 0.17.4", + "tracing-opentelemetry", "uuid", ] @@ -2574,20 +2556,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-opentelemetry" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" -dependencies = [ - "once_cell", - "opentelemetry 0.17.0", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", -] - [[package]] name = "tracing-opentelemetry" version = "0.18.0" @@ -2595,7 +2563,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" dependencies = [ "once_cell", - "opentelemetry 0.18.0", + "opentelemetry", "tracing", "tracing-core", "tracing-log", diff --git a/bkapi-client/Cargo.toml b/bkapi-client/Cargo.toml index d1fd912..f3e38ff 100644 --- a/bkapi-client/Cargo.toml +++ b/bkapi-client/Cargo.toml @@ -6,14 +6,15 @@ edition = "2018" [dependencies] tracing = "0.1" -tracing-opentelemetry = "0.17" +tracing-opentelemetry = "0.18" -opentelemetry = "0.17" -opentelemetry-http = "0.6" +opentelemetry = "0.18" +opentelemetry-http = "0.7" futures = "0.3" reqwest = { version = "0.11", features = ["json"] } +async-nats = "0.21" serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/bkapi/Cargo.toml b/bkapi/Cargo.toml index 7368140..a763b8e 100644 --- a/bkapi/Cargo.toml +++ b/bkapi/Cargo.toml @@ -32,7 +32,7 @@ serde_json = "1" actix-web = "4" actix-http = "3" actix-service = "2" -tracing-actix-web = { version = "0.6", features = ["opentelemetry_0_17"] } +tracing-actix-web = { version = "0.6", features = ["opentelemetry_0_18"] } async-nats = "0.21"