vbrandl/hoc
1
0
Fork 0
Code Issues 1 Pull Requests Actions Projects Releases Wiki Activity

Downgrade opentelemetry dependencies
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Valentin Brandl 2021-03-29 15:19:11 +02:00
parent 35c13fa486
commit 6ac399a41b
3 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Cargo.lock generated
View File

@ -276,7 +276,7 @@ dependencies = [
"actix-http", "actix-http",
"actix-web", "actix-web",
"futures", "futures",
"opentelemetry 0.12.0", "opentelemetry",
"opentelemetry-semantic-conventions", "opentelemetry-semantic-conventions",
"serde 1.0.125", "serde 1.0.125",
] ]
@ -972,7 +972,7 @@ dependencies = [
"lazy_static", "lazy_static",
"number_prefix", "number_prefix",
"openssl-probe", "openssl-probe",
"opentelemetry 0.13.0", "opentelemetry",
"opentelemetry-jaeger", "opentelemetry-jaeger",
"reqwest", "reqwest",
"ructe", "ructe",
@ -1534,35 +1534,19 @@ dependencies = [
"pin-project 1.0.5", "pin-project 1.0.5",
"rand 0.8.3", "rand 0.8.3",
"thiserror", "thiserror",
]
[[package]]
name = "opentelemetry"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b91cea1dfd50064e52db033179952d18c770cbc5dfefc8eba45d619357ba3914"
dependencies = [
"async-trait",
"futures",
"js-sys",
"lazy_static",
"percent-encoding",
"pin-project 1.0.5",
"rand 0.8.3",
"thiserror",
"tokio 1.4.0", "tokio 1.4.0",
"tokio-stream", "tokio-stream",
] ]
[[package]] [[package]]
name = "opentelemetry-jaeger" name = "opentelemetry-jaeger"
version = "0.12.0" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a619edf77ab8bc75d99220811e1cf1a14f1760750c80c4752a20a9aef7dce214" checksum = "a5677b3a361784aff6e2b1b30dbdb5f85f4ec57ff2ced41d9a481ad70a9d0b57"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"lazy_static", "lazy_static",
"opentelemetry 0.13.0", "opentelemetry",
"thiserror", "thiserror",
"thrift", "thrift",
] ]
@ -1573,7 +1557,7 @@ 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 = "0ecb679b997c41108a498e3ce8b933fe2f643a9a722ad8ca33f95edab84df106" checksum = "0ecb679b997c41108a498e3ce8b933fe2f643a9a722ad8ca33f95edab84df106"
dependencies = [ dependencies = [
"opentelemetry 0.12.0", "opentelemetry",
] ]
[[package]] [[package]]
@ -2532,7 +2516,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccdf13c28f1654fe806838f28c5b9cb23ca4c0eae71450daa489f50e523ceb1" checksum = "cccdf13c28f1654fe806838f28c5b9cb23ca4c0eae71450daa489f50e523ceb1"
dependencies = [ dependencies = [
"opentelemetry 0.12.0", "opentelemetry",
"tracing", "tracing",
"tracing-core", "tracing-core",
"tracing-log", "tracing-log",

4
Cargo.toml
View File

@ -25,8 +25,8 @@ 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.13.0", default-features = false, features = ["trace", "rt-tokio-current-thread"] } opentelemetry = { version = "0.12.0", default-features = false, features = ["trace", "tokio-support"] }
opentelemetry-jaeger = "0.12.0" opentelemetry-jaeger = "0.11.0"
reqwest = "0.10.10" reqwest = "0.10.10"
serde = "1.0.125" serde = "1.0.125"
serde_derive = "1.0.123" serde_derive = "1.0.123"

6
src/telemetry.rs
View File

@ -1,4 +1,4 @@
use opentelemetry::{global, runtime::TokioCurrentThread}; use opentelemetry::global;
use tracing::{subscriber::set_global_default, Subscriber}; use tracing::{subscriber::set_global_default, Subscriber};
use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer}; use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
use tracing_log::LogTracer; use tracing_log::LogTracer;
@ -11,9 +11,9 @@ pub fn get_subscriber(name: &str, env_filter: &str) -> impl Subscriber + Send +
let formatting_layer = BunyanFormattingLayer::new(name.to_string(), std::io::stdout); let formatting_layer = BunyanFormattingLayer::new(name.to_string(), std::io::stdout);
global::set_text_map_propagator(opentelemetry_jaeger::Propagator::new()); global::set_text_map_propagator(opentelemetry_jaeger::Propagator::new());
let tracer = opentelemetry_jaeger::new_pipeline() let (tracer, _) = opentelemetry_jaeger::new_pipeline()
.with_service_name(name) .with_service_name(name)
.install_batch(TokioCurrentThread) .install()
.expect("cannot install jaeger pipeline"); .expect("cannot install jaeger pipeline");
let telemetry = tracing_opentelemetry::layer().with_tracer(tracer); let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);