From a12b272a40fdf423b880d556c6b71b8ef8e9dace Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Mon, 8 May 2023 11:13:33 -0500
Subject: [PATCH] Update opentelemetry features, remove 0.17

---
 Cargo.lock | 51 +++++++++------------------------------------------
 Cargo.toml |  6 +++---
 2 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 86d4063..e35d542 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1368,25 +1368,6 @@ version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
-[[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"
@@ -1407,7 +1388,7 @@ dependencies = [
  "futures",
  "futures-util",
  "http",
- "opentelemetry 0.18.0",
+ "opentelemetry",
  "opentelemetry-proto",
  "prost",
  "thiserror",
@@ -1423,7 +1404,7 @@ checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28"
 dependencies = [
  "futures",
  "futures-util",
- "opentelemetry 0.18.0",
+ "opentelemetry",
  "prost",
  "tonic",
  "tonic-build",
@@ -1622,7 +1603,7 @@ dependencies = [
  "mime",
  "num_cpus",
  "once_cell",
- "opentelemetry 0.18.0",
+ "opentelemetry",
  "opentelemetry-otlp",
  "pin-project-lite",
  "reqwest",
@@ -1644,7 +1625,7 @@ dependencies = [
  "tracing-error",
  "tracing-futures",
  "tracing-log",
- "tracing-opentelemetry 0.18.0",
+ "tracing-opentelemetry",
  "tracing-subscriber",
  "url",
  "uuid",
@@ -2589,10 +2570,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2def0ffabc0116481e14e82cf705fef814f5178171d445b6790137ff8a85a73"
 dependencies = [
  "actix-web",
- "opentelemetry 0.17.0",
+ "opentelemetry",
  "pin-project",
  "tracing",
- "tracing-opentelemetry 0.17.4",
+ "tracing-opentelemetry",
  "uuid",
 ]
 
@@ -2618,10 +2599,10 @@ dependencies = [
  "awc",
  "bytes",
  "futures-core",
- "opentelemetry 0.17.0",
+ "opentelemetry",
  "pin-project-lite",
  "tracing",
- "tracing-opentelemetry 0.17.4",
+ "tracing-opentelemetry",
 ]
 
 [[package]]
@@ -2665,20 +2646,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"
@@ -2686,7 +2653,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/Cargo.toml b/Cargo.toml
index 895a32b..8e2b194 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -73,9 +73,9 @@ uuid = { version = "1.1.2", features = ["v4", "serde"] }
 [dependencies.tracing-actix-web]
 version = "0.7.0"
 default-features = false
-features = ["emit_event_on_error", "opentelemetry_0_17"]
+features = ["emit_event_on_error", "opentelemetry_0_18"]
 
 [dependencies.tracing-awc]
-version = "0.1.0"
+version = "0.1.6"
 default-features = false
-features = ["emit_event_on_error", "opentelemetry_0_17"]
+features = ["emit_event_on_error", "opentelemetry_0_18"]