From 1e81c0f0efbf3dfd30b47e23c6d97b7a3492b946 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 17:42:41 +0000
Subject: [PATCH 1/2] chore(deps): bump tracing-actix-web from 0.7.10 to 0.7.11

Bumps [tracing-actix-web](https://github.com/LukeMathWalker/tracing-actix-web) from 0.7.10 to 0.7.11.
- [Commits](https://github.com/LukeMathWalker/tracing-actix-web/compare/v0.7.10...v0.7.11)

---
updated-dependencies:
- dependency-name: tracing-actix-web
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b25d4e49..f205b43b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8653,9 +8653,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-actix-web"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa069bd1503dd526ee793bb3fce408895136c95fc86d2edb2acf1c646d7f0684"
+checksum = "4ee9e39a66d9b615644893ffc1704d2a89b5b315b7fd0228ad3182ca9a306b19"
 dependencies = [
  "actix-web",
  "mutually_exclusive_features",
@@ -8873,7 +8873,7 @@ version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "rand 0.8.5",
  "static_assertions",
 ]

From d9c600379f26a76cfe79404afa1506c8b549f9f0 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Mon, 10 Jun 2024 19:03:36 +0100
Subject: [PATCH 2/2] use opentelemetry_0_23

---
 Cargo.lock                             | 30 ++++++++++----------------
 tracing/mainmatter-workshop/Cargo.toml | 10 ++++-----
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f205b43b..d5f3a3b3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5566,9 +5566,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf"
+checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -5576,21 +5576,19 @@ dependencies = [
  "once_cell",
  "pin-project-lite 0.2.13",
  "thiserror",
- "urlencoding",
 ]
 
 [[package]]
 name = "opentelemetry-otlp"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb"
+checksum = "a94c69209c05319cdf7460c6d4c055ed102be242a0a6245835d7bc42c6ec7f54"
 dependencies = [
  "async-trait",
  "futures-core",
  "http 0.2.9",
  "opentelemetry",
  "opentelemetry-proto",
- "opentelemetry-semantic-conventions",
  "opentelemetry_sdk",
  "prost",
  "thiserror",
@@ -5600,9 +5598,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-proto"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4"
+checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162"
 dependencies = [
  "opentelemetry",
  "opentelemetry_sdk",
@@ -5610,24 +5608,18 @@ dependencies = [
  "tonic",
 ]
 
-[[package]]
-name = "opentelemetry-semantic-conventions"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910"
-
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.22.1"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e"
+checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd"
 dependencies = [
  "async-trait",
- "crossbeam-channel",
  "futures-channel",
  "futures-executor",
  "futures-util",
  "glob",
+ "lazy_static",
  "once_cell",
  "opentelemetry",
  "ordered-float",
@@ -8769,9 +8761,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-opentelemetry"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284"
+checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4"
 dependencies = [
  "js-sys",
  "once_cell",
diff --git a/tracing/mainmatter-workshop/Cargo.toml b/tracing/mainmatter-workshop/Cargo.toml
index 2cc9a2ed..e6f769eb 100644
--- a/tracing/mainmatter-workshop/Cargo.toml
+++ b/tracing/mainmatter-workshop/Cargo.toml
@@ -11,12 +11,12 @@ actix-web-lab.workspace = true
 dotenvy.workspace = true
 metrics = "0.23"
 metrics-exporter-prometheus = { version = "0.15", default-features = false }
-opentelemetry = "0.22"
-opentelemetry_sdk = { version = "0.22", features = ["rt-tokio-current-thread"] }
-opentelemetry-otlp = { version = "0.15", features = ["tls-roots"] }
+opentelemetry = "0.23"
+opentelemetry_sdk = { version = "0.23", features = ["rt-tokio-current-thread"] }
+opentelemetry-otlp = { version = "0.16", features = ["tls-roots"] }
 tonic = "0.11"
-tracing-actix-web = { version = "0.7", features = ["opentelemetry_0_22", "uuid_v7"] }
-tracing-opentelemetry = "0.23"
+tracing-actix-web = { version = "0.7.11", features = ["opentelemetry_0_23", "uuid_v7"] }
+tracing-opentelemetry = "0.24"
 tracing-subscriber.workspace = true
 tracing-bunyan-formatter = "0.3"
 tracing.workspace = true