From e7da671894703962f68cc06613ac7424712374e1 Mon Sep 17 00:00:00 2001
From: "hash-worker[bot]" <180894564+hash-worker[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2024 00:26:52 +0000
Subject: [PATCH 1/2] Update `opentelemetry` Rust crates to v0.27.1

---
 Cargo.lock | 34 ++++++++++++++++------------------
 Cargo.toml |  4 ++--
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 63c531450e7..bfc27eac6ce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2842,8 +2842,8 @@ dependencies = [
  "hyper 1.5.1",
  "include_dir",
  "mime",
- "opentelemetry 0.27.0",
- "opentelemetry_sdk 0.27.0",
+ "opentelemetry 0.27.1",
+ "opentelemetry_sdk 0.27.1",
  "sentry",
  "serde",
  "serde_json",
@@ -3190,9 +3190,9 @@ dependencies = [
  "clap_builder",
  "derive_more 1.0.0",
  "error-stack",
- "opentelemetry 0.27.0",
+ "opentelemetry 0.27.1",
  "opentelemetry-otlp",
- "opentelemetry_sdk 0.27.0",
+ "opentelemetry_sdk 0.27.1",
  "sentry",
  "sentry-types",
  "tokio",
@@ -5116,16 +5116,16 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3cebff57f7dbd1255b44d8bddc2cebeb0ea677dbaa2e25a3070a91b318f660"
+checksum = "ab70038c28ed37b97d8ed414b6429d343a8bbf44c9f79ec854f3a643029ba6d7"
 dependencies = [
  "futures-core",
  "futures-sink",
  "js-sys",
- "once_cell",
  "pin-project-lite",
  "thiserror 1.0.69",
+ "tracing",
 ]
 
 [[package]]
@@ -5137,9 +5137,9 @@ dependencies = [
  "async-trait",
  "futures-core",
  "http 1.1.0",
- "opentelemetry 0.27.0",
+ "opentelemetry 0.27.1",
  "opentelemetry-proto",
- "opentelemetry_sdk 0.27.0",
+ "opentelemetry_sdk 0.27.1",
  "prost 0.13.3",
  "thiserror 1.0.69",
  "tokio",
@@ -5152,8 +5152,8 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6e05acbfada5ec79023c85368af14abd0b307c015e9064d249b2a950ef459a6"
 dependencies = [
- "opentelemetry 0.27.0",
- "opentelemetry_sdk 0.27.0",
+ "opentelemetry 0.27.1",
+ "opentelemetry_sdk 0.27.1",
  "prost 0.13.3",
  "tonic 0.12.3",
 ]
@@ -5183,16 +5183,14 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b742c1cae4693792cc564e58d75a2a0ba29421a34a85b50da92efa89ecb2bc"
+checksum = "231e9d6ceef9b0b2546ddf52335785ce41252bc7474ee8ba05bfad277be13ab8"
 dependencies = [
- "async-trait",
  "futures-channel",
  "futures-executor",
  "futures-util",
- "once_cell",
- "opentelemetry 0.27.0",
+ "opentelemetry 0.27.1",
  "percent-encoding",
  "rand",
  "thiserror 1.0.69",
@@ -8024,8 +8022,8 @@ checksum = "97a971f6058498b5c0f1affa23e7ea202057a7301dbff68e968b2d578bcbd053"
 dependencies = [
  "js-sys",
  "once_cell",
- "opentelemetry 0.27.0",
- "opentelemetry_sdk 0.27.0",
+ "opentelemetry 0.27.1",
+ "opentelemetry_sdk 0.27.1",
  "tracing",
  "tracing-core",
  "tracing-subscriber",
diff --git a/Cargo.toml b/Cargo.toml
index 83745be126f..a6f8e2ef357 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -187,9 +187,9 @@ mimalloc                    = { version = "=0.1.43", default-features = false }
 mime                        = { version = "=0.3.17", default-features = false }
 num-traits                  = { version = "=0.2.19", default-features = false }
 once_cell                   = { version = "=1.20.2", default-features = false }
-opentelemetry               = { version = "=0.27.0", default-features = false }
+opentelemetry               = { version = "=0.27.1", default-features = false }
 opentelemetry-otlp          = { version = "=0.27.0", default-features = false }
-opentelemetry_sdk           = { version = "=0.27.0", default-features = false }
+opentelemetry_sdk           = { version = "=0.27.1", default-features = false }
 orx-concurrent-vec          = { version = "=3.0.2", default-features = false }
 owo-colors                  = { version = "=4.1.0", default-features = false }
 paste                       = { version = "=1.0.15", default-features = false }

From bd0697bf886d960127c57b2ca9dc00efad336463 Mon Sep 17 00:00:00 2001
From: Tim Diekmann <post@timdiekmann.de>
Date: Mon, 2 Dec 2024 10:54:06 +0100
Subject: [PATCH 2/2] Use `Builder` instead of `Config` to configure tracer

---
 libs/@local/tracing/src/opentelemetry.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libs/@local/tracing/src/opentelemetry.rs b/libs/@local/tracing/src/opentelemetry.rs
index b0d99ceb758..db97952b644 100644
--- a/libs/@local/tracing/src/opentelemetry.rs
+++ b/libs/@local/tracing/src/opentelemetry.rs
@@ -72,16 +72,13 @@ where
     //   - OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT
     //   - OTEL_SPAN_EVENT_COUNT_LIMIT
     //   - OTEL_SPAN_LINK_COUNT_LIMIT
-    let trace_config = trace::Config::default()
+    let tracer = trace::TracerProvider::builder()
+        .with_batch_exporter(exporter, runtime::Tokio)
         .with_sampler(Sampler::ParentBased(Box::new(Sampler::TraceIdRatioBased(
             0.1,
         ))))
         .with_id_generator(RandomIdGenerator::default())
-        .with_resource(Resource::new(vec![KeyValue::new("service.name", "graph")]));
-
-    let tracer = trace::TracerProvider::builder()
-        .with_batch_exporter(exporter, runtime::Tokio)
-        .with_config(trace_config)
+        .with_resource(Resource::new(vec![KeyValue::new("service.name", "graph")]))
         .build()
         .tracer("graph");