From 7ff28405ea6e6adf2d1e7ab380458f6c75aba048 Mon Sep 17 00:00:00 2001
From: Marco Neumann <marco@crepererum.net>
Date: Mon, 30 Aug 2021 13:46:59 +0200
Subject: [PATCH] chore: fix `opentelemetry-jeager` upgrade

---
 Cargo.lock                 | 5 ++++-
 trace_exporters/Cargo.toml | 4 ++--
 trace_exporters/src/lib.rs | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9cf740d081..c191eab218 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2723,6 +2723,8 @@ dependencies = [
  "pin-project 1.0.8",
  "rand 0.8.4",
  "thiserror",
+ "tokio",
+ "tokio-stream",
 ]
 
 [[package]]
@@ -2737,6 +2739,7 @@ dependencies = [
  "opentelemetry-semantic-conventions",
  "thiserror",
  "thrift",
+ "tokio",
 ]
 
 [[package]]
@@ -4890,7 +4893,7 @@ dependencies = [
  "chrono",
  "futures",
  "observability_deps",
- "opentelemetry 0.15.0",
+ "opentelemetry 0.16.0",
  "opentelemetry-jaeger",
  "snafu",
  "structopt",
diff --git a/trace_exporters/Cargo.toml b/trace_exporters/Cargo.toml
index 5e2264a9ee..b14fde58c9 100644
--- a/trace_exporters/Cargo.toml
+++ b/trace_exporters/Cargo.toml
@@ -11,8 +11,8 @@ async-trait = "0.1"
 chrono = { version = "0.4" }
 futures = "0.3"
 observability_deps = { path = "../observability_deps" }
-opentelemetry = "0.15"
-opentelemetry-jaeger = { version = "0.15", optional = true }
+opentelemetry = { version = "0.16", features = ["rt-tokio"] }
+opentelemetry-jaeger = { version = "0.15", optional = true, features = ["rt-tokio"] }
 snafu = "0.6"
 structopt = { version = "0.3.21" }
 tokio = { version = "1.0", features = ["macros", "time", "sync", "rt"] }
diff --git a/trace_exporters/src/lib.rs b/trace_exporters/src/lib.rs
index 4192e81a38..8f144110c1 100644
--- a/trace_exporters/src/lib.rs
+++ b/trace_exporters/src/lib.rs
@@ -119,7 +119,7 @@ fn jaeger_exporter(config: &TracingConfig) -> Result<Arc<dyn TraceCollector>> {
     let exporter = opentelemetry_jaeger::new_pipeline()
         .with_agent_endpoint(agent_endpoint)
         .with_service_name(&config.traces_exporter_jaeger_service_name)
-        .init_exporter()
+        .init_async_exporter(opentelemetry::runtime::Tokio {})
         .map_err(|source| Error::TraceExporter { source })?;
 
     Ok(Arc::new(otel::OtelExporter::new(exporter)))