From a57839af5aa51407c0813b14e4ac471d9dd93e48 Mon Sep 17 00:00:00 2001 From: Michael Lieberman Date: Sun, 14 Apr 2024 16:29:58 +0000 Subject: [PATCH] Fix logging for now --- Cargo.lock | 59 ++++++++++-------------------------------- skootrs-bin/Cargo.toml | 4 +-- 2 files changed, 16 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2b63d1c..10d95fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1738,42 +1738,30 @@ dependencies = [ "urlencoding", ] -[[package]] -name = "opentelemetry" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" -dependencies = [ - "futures-core", - "futures-sink", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - [[package]] name = "opentelemetry-jaeger" -version = "0.21.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7f5ef13427696ae8382c6f3bb7dcdadb5994223d6b983c7c50a46df7d19277" +checksum = "e617c66fd588e40e0dbbd66932fdc87393095b125d4459b1a3a10feb1712f8a1" dependencies = [ "async-trait", "futures-core", "futures-util", - "opentelemetry 0.22.0", + "opentelemetry", "opentelemetry-semantic-conventions", - "opentelemetry_sdk 0.22.1", + "opentelemetry_sdk", "thrift", "tokio", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.14.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910" +checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" +dependencies = [ + "opentelemetry", +] [[package]] name = "opentelemetry_sdk" @@ -1788,26 +1776,7 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry 0.21.0", - "ordered-float 4.2.0", - "percent-encoding", - "rand 0.8.5", - "thiserror", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry 0.22.0", + "opentelemetry", "ordered-float 4.2.0", "percent-encoding", "rand 0.8.5", @@ -2651,9 +2620,9 @@ dependencies = [ "clio", "inquire", "octocrab 0.32.0", - "opentelemetry 0.21.0", + "opentelemetry", "opentelemetry-jaeger", - "opentelemetry_sdk 0.22.1", + "opentelemetry_sdk", "reqwest 0.11.24", "serde", "serde_json", @@ -3230,8 +3199,8 @@ checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" dependencies = [ "js-sys", "once_cell", - "opentelemetry 0.21.0", - "opentelemetry_sdk 0.21.2", + "opentelemetry", + "opentelemetry_sdk", "smallvec", "tracing", "tracing-core", diff --git a/skootrs-bin/Cargo.toml b/skootrs-bin/Cargo.toml index cab6f16..a83e64a 100644 --- a/skootrs-bin/Cargo.toml +++ b/skootrs-bin/Cargo.toml @@ -21,11 +21,11 @@ tokio = { version = "1.34.0", features = ["full", "tracing", "macros", "rt-multi tracing-subscriber = { version = "0.3.18", features = ["registry", "env-filter"] } serde_json = "1.0.112" skootrs-model = { path = "../skootrs-model" } -opentelemetry-jaeger = { version = "0.21.0", features = ["rt-tokio-current-thread"] } +opentelemetry-jaeger = { version = "0.20.0", features = ["rt-tokio-current-thread"] } tracing-opentelemetry = "0.22.0" tracing-bunyan-formatter = "0.3.9" opentelemetry = { version = "0.21.0" } -opentelemetry_sdk = "0.22.1" +opentelemetry_sdk = "0.21.2" serde_yaml = "0.9.32" reqwest = "0.11.24" base64 = "0.22.0"