From bb04d94fa92740eebeee513030faf136bfd26da7 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 18 Feb 2022 20:39:55 +0100
Subject: Update to Netapp 0.4 which supports distributed tracing

---
 src/api/api_server.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/api/api_server.rs')

diff --git a/src/api/api_server.rs b/src/api/api_server.rs
index 15b00dde..00d582d1 100644
--- a/src/api/api_server.rs
+++ b/src/api/api_server.rs
@@ -9,7 +9,7 @@ use hyper::{Body, Method, Request, Response, Server};
 
 use opentelemetry::{
 	trace::{FutureExt, TraceContextExt, Tracer},
-	Context,
+	Context, KeyValue,
 };
 
 use garage_util::data::*;
@@ -50,15 +50,19 @@ pub async fn run_api_server(
 				let garage = garage.clone();
 
 				let tracer = opentelemetry::global::tracer("garage");
-				let uuid = gen_uuid();
+				let trace_id = gen_uuid();
 				let span = tracer
 					.span_builder("S3 API call (unknown)")
 					.with_trace_id(
 						opentelemetry::trace::TraceId::from_hex(&hex::encode(
-							&uuid.as_slice()[..16],
+							&trace_id.as_slice()[..16],
 						))
 						.unwrap(),
 					)
+					.with_attributes(vec![
+						KeyValue::new("method", format!("{}", req.method())),
+						KeyValue::new("uri", req.uri().path().to_string()),
+					])
 					.start(&tracer);
 
 				handler(garage, req, client_addr).with_context(Context::current_with_span(span))
-- 
cgit v1.2.3