Update CoW dependencies to v2.320.0 (#151)

Updated CoW dependencies to v2.320.0

Co-authored-by: Your Name <your-email@example.com>
Co-authored-by: ilya <ilya@cow.fi>

Author: 3 people

Cargo.lock

@@ -47,16 +47,16 @@ tower-http = { version = "0.4", features = ["trace"] }
 tracing = "0.1"
 web3 = "0.19"
 
-contracts = { git = "https://github.com/cowprotocol/services.git", tag = "v2.319.0", package = "contracts" }
-ethrpc = { git = "https://github.com/cowprotocol/services.git", tag = "v2.319.0", package = "ethrpc" }
-observe = { git = "https://github.com/cowprotocol/services.git", tag = "v2.319.0", package = "observe" }
-shared = { git = "https://github.com/cowprotocol/services.git", tag = "v2.319.0", package = "shared" }
-dto =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.319.0", package = "solvers-dto" }
-rate-limit =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.319.0", package = "rate-limit" }
-number =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.319.0", package = "number" }
+contracts = { git = "https://github.com/cowprotocol/services.git", tag = "v2.320.0", package = "contracts" }
+ethrpc = { git = "https://github.com/cowprotocol/services.git", tag = "v2.320.0", package = "ethrpc" }
+observe = { git = "https://github.com/cowprotocol/services.git", tag = "v2.320.0", package = "observe" , features = ["axum-tracing"]}
+shared = { git = "https://github.com/cowprotocol/services.git", tag = "v2.320.0", package = "shared" }
+dto =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.320.0", package = "solvers-dto" }
+rate-limit =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.320.0", package = "rate-limit" }
+number =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.320.0", package = "number" }
 
 [dev-dependencies]
-testlib =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.319.0", package = "testlib" }
+testlib =  { git = "https://github.com/cowprotocol/services.git", tag = "v2.320.0", package = "testlib" }
 glob = "0.3"
 maplit = "1"
 tempfile = "3"

Cargo.toml

@@ -3,6 +3,7 @@
 use {
     crate::domain::solver::Solver,
     axum::extract::DefaultBodyLimit,
+    observe::distributed_tracing::tracing_axum::{make_span, record_trace_id},
     std::{future::Future, net::SocketAddr, sync::Arc},
     tokio::sync::oneshot,
 };
@@ -25,14 +26,14 @@ impl Api {
             .route("/healthz", axum::routing::get(routes::healthz))
             .route("/solve", axum::routing::post(routes::solve))
             .layer(
-                tower::ServiceBuilder::new().layer(tower_http::trace::TraceLayer::new_for_http()),
+                tower::ServiceBuilder::new()
+                    .layer(tower_http::trace::TraceLayer::new_for_http().make_span_with(make_span))
+                    .map_request(record_trace_id),
             )
             .layer(DefaultBodyLimit::disable())
             .with_state(Arc::new(self.solver));
 
-        let make_svc = observe::make_service_with_request_tracing!(app);
-
-        let server = axum::Server::bind(&self.addr).serve(make_svc);
+        let server = axum::Server::bind(&self.addr).serve(app.into_make_service());
         if let Some(bind) = bind {
             let _ = bind.send(server.local_addr());
         }