From 09feead2c859fedd87df4c5e1ec9e428a3d21377 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2025 21:15:03 +0000
Subject: [PATCH] Update CoW dependencies to v2.295.0 (#105)

Updated CoW dependencies to v2.295.0

---------

Co-authored-by: ilya <ilya@cow.fi>
---
 Cargo.lock       | 28 ++++++++++++++--------------
 Cargo.toml       | 16 ++++++++--------
 src/api/mod.rs   |  2 +-
 src/util/http.rs |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b5825d6..d4210dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -139,7 +139,7 @@ checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
 [[package]]
 name = "app-data"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "anyhow",
  "bytes-hex",
@@ -775,7 +775,7 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 [[package]]
 name = "bytes-hex"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "hex",
  "serde",
@@ -826,7 +826,7 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 [[package]]
 name = "chain"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "derive_more 1.0.0",
  "ethcontract",
@@ -960,7 +960,7 @@ dependencies = [
 [[package]]
 name = "contracts"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "anyhow",
  "ethcontract",
@@ -1152,7 +1152,7 @@ dependencies = [
 [[package]]
 name = "database"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "bigdecimal",
  "chrono",
@@ -1458,7 +1458,7 @@ dependencies = [
 [[package]]
 name = "ethrpc"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2568,7 +2568,7 @@ dependencies = [
 [[package]]
 name = "model"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "anyhow",
  "app-data",
@@ -2741,7 +2741,7 @@ dependencies = [
 [[package]]
 name = "number"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "anyhow",
  "bigdecimal",
@@ -2763,7 +2763,7 @@ dependencies = [
 [[package]]
 name = "observe"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "async-trait",
  "atty",
@@ -2838,7 +2838,7 @@ dependencies = [
 [[package]]
 name = "order-validation"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "contracts",
  "ethcontract",
@@ -3257,7 +3257,7 @@ dependencies = [
 [[package]]
 name = "rate-limit"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "anyhow",
  "futures",
@@ -3803,7 +3803,7 @@ dependencies = [
 [[package]]
 name = "shared"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "anyhow",
  "app-data",
@@ -3971,7 +3971,7 @@ dependencies = [
 [[package]]
 name = "solvers-dto"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "app-data",
  "bigdecimal",
@@ -4378,7 +4378,7 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 [[package]]
 name = "testlib"
 version = "0.1.0"
-source = "git+https://github.com/cowprotocol/services.git?tag=v2.294.0#a6b8f42ca5952a3d0b4882c957ae97b7c833f5c9"
+source = "git+https://github.com/cowprotocol/services.git?tag=v2.295.0#589e52d9398438bc08e6e5d5ab8b4a7258a1e7e0"
 dependencies = [
  "anyhow",
  "ethcontract",
diff --git a/Cargo.toml b/Cargo.toml
index 4846802..cce4df1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,16 +46,16 @@ tracing = "0.1"
 web3 = "0.19"
 lru = "0.12.5"
 
-contracts = { git = "https://github.com/cowprotocol/services.git", tag = "v2.294.0", package = "contracts" }
-ethrpc = { git = "https://github.com/cowprotocol/services.git", tag = "v2.294.0", package = "ethrpc" }
-observe = { git = "https://github.com/cowprotocol/services.git", tag = "v2.294.0", package = "observe" }
-shared = { git = "https://github.com/cowprotocol/services.git", tag = "v2.294.0", package = "shared" }
-dto =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.294.0", package = "solvers-dto" }
-rate-limit =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.294.0", package = "rate-limit" }
-number =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.294.0", package = "number" }
+contracts = { git = "https://github.com/cowprotocol/services.git", tag = "v2.295.0", package = "contracts" }
+ethrpc = { git = "https://github.com/cowprotocol/services.git", tag = "v2.295.0", package = "ethrpc" }
+observe = { git = "https://github.com/cowprotocol/services.git", tag = "v2.295.0", package = "observe" }
+shared = { git = "https://github.com/cowprotocol/services.git", tag = "v2.295.0", package = "shared" }
+dto =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.295.0", package = "solvers-dto" }
+rate-limit =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.295.0", package = "rate-limit" }
+number =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.295.0", package = "number" }
 
 [dev-dependencies]
-testlib =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.294.0", package = "testlib" }
+testlib =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.295.0", package = "testlib" }
 glob = "0.3"
 maplit = "1"
 tempfile = "3"
diff --git a/src/api/mod.rs b/src/api/mod.rs
index 9e17035..46d4df2 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -30,7 +30,7 @@ impl Api {
             .layer(DefaultBodyLimit::disable())
             .with_state(Arc::new(self.solver));
 
-        let make_svc = observe::make_service_with_task_local_storage!(app);
+        let make_svc = observe::make_service_with_request_tracing!(app);
 
         let server = axum::Server::bind(&self.addr).serve(make_svc);
         if let Some(bind) = bind {
diff --git a/src/util/http.rs b/src/util/http.rs
index 34d9855..e8726f7 100644
--- a/src/util/http.rs
+++ b/src/util/http.rs
@@ -51,7 +51,7 @@ where
     T: DeserializeOwned,
     E: DeserializeOwned,
 {
-    if let Some(id) = observe::request_id::get_task_local_storage() {
+    if let Some(id) = observe::request_id::from_current_span() {
         request = request.header("X-REQUEST-ID", id);
     }
     let (client, request) = request.build_split();