From 6ac399a41b16f2e2ae131389aea3c46ffd9a4e2b Mon Sep 17 00:00:00 2001
From: Valentin Brandl <mail+dev@vbrandl.net>
Date: Mon, 29 Mar 2021 15:19:11 +0200
Subject: [PATCH] Downgrade opentelemetry dependencies

---
 Cargo.lock       | 30 +++++++-----------------------
 Cargo.toml       |  4 ++--
 src/telemetry.rs |  6 +++---
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fbb0c73..c9be0eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -276,7 +276,7 @@ dependencies = [
  "actix-http",
  "actix-web",
  "futures",
- "opentelemetry 0.12.0",
+ "opentelemetry",
  "opentelemetry-semantic-conventions",
  "serde 1.0.125",
 ]
@@ -972,7 +972,7 @@ dependencies = [
  "lazy_static",
  "number_prefix",
  "openssl-probe",
- "opentelemetry 0.13.0",
+ "opentelemetry",
  "opentelemetry-jaeger",
  "reqwest",
  "ructe",
@@ -1534,35 +1534,19 @@ dependencies = [
  "pin-project 1.0.5",
  "rand 0.8.3",
  "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-stream",
 ]
 
 [[package]]
 name = "opentelemetry-jaeger"
-version = "0.12.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a619edf77ab8bc75d99220811e1cf1a14f1760750c80c4752a20a9aef7dce214"
+checksum = "a5677b3a361784aff6e2b1b30dbdb5f85f4ec57ff2ced41d9a481ad70a9d0b57"
 dependencies = [
  "async-trait",
  "lazy_static",
- "opentelemetry 0.13.0",
+ "opentelemetry",
  "thiserror",
  "thrift",
 ]
@@ -1573,7 +1557,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ecb679b997c41108a498e3ce8b933fe2f643a9a722ad8ca33f95edab84df106"
 dependencies = [
- "opentelemetry 0.12.0",
+ "opentelemetry",
 ]
 
 [[package]]
@@ -2532,7 +2516,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cccdf13c28f1654fe806838f28c5b9cb23ca4c0eae71450daa489f50e523ceb1"
 dependencies = [
- "opentelemetry 0.12.0",
+ "opentelemetry",
  "tracing",
  "tracing-core",
  "tracing-log",
diff --git a/Cargo.toml b/Cargo.toml
index ed49367..436b283 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,8 +25,8 @@ git2 = "0.13.17"
 lazy_static = "1.4.0"
 number_prefix = "0.4.0"
 openssl-probe = "0.1.2"
-opentelemetry = { version = "0.13.0", default-features = false, features = ["trace", "rt-tokio-current-thread"] }
-opentelemetry-jaeger = "0.12.0"
+opentelemetry = { version = "0.12.0", default-features = false, features = ["trace", "tokio-support"] }
+opentelemetry-jaeger = "0.11.0"
 reqwest = "0.10.10"
 serde = "1.0.125"
 serde_derive = "1.0.123"
diff --git a/src/telemetry.rs b/src/telemetry.rs
index 2a441da..c5f9954 100644
--- a/src/telemetry.rs
+++ b/src/telemetry.rs
@@ -1,4 +1,4 @@
-use opentelemetry::{global, runtime::TokioCurrentThread};
+use opentelemetry::global;
 use tracing::{subscriber::set_global_default, Subscriber};
 use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
 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);
 
     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)
-        .install_batch(TokioCurrentThread)
+        .install()
         .expect("cannot install jaeger pipeline");
     let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);