From 378a6faec25b1332415c55658e09d23804fff995 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 22 Nov 2024 19:48:55 +0200
Subject: [PATCH] fix(tvix/nar-bridge): explicitly select fields to add to span

We got some double-quoted strings at narinfo_str, and it didn't align
well with our other field names.

Change-Id: I5c08786d2c4435542bf39ff44b9d4ada5400550d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12826
Tested-by: BuildkiteCI
Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
---
 tvix/nar-bridge/src/nar.rs     | 4 ++--
 tvix/nar-bridge/src/narinfo.rs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tvix/nar-bridge/src/nar.rs b/tvix/nar-bridge/src/nar.rs
index 292be2b1c..f9b50fd6b 100644
--- a/tvix/nar-bridge/src/nar.rs
+++ b/tvix/nar-bridge/src/nar.rs
@@ -21,7 +21,7 @@ pub(crate) struct GetNARParams {
     nar_size: u64,
 }
 
-#[instrument(skip(blob_service, directory_service))]
+#[instrument(skip_all)]
 pub async fn get_head(
     method: axum::http::Method,
     ranges: Option<TypedHeader<Range>>,
@@ -145,7 +145,7 @@ pub async fn head_root_nodes(
     }
 }
 
-#[instrument(skip(blob_service, directory_service, request))]
+#[instrument(skip_all)]
 pub async fn put(
     axum::extract::Path(nar_str): axum::extract::Path<String>,
     axum::extract::State(AppState {
diff --git a/tvix/nar-bridge/src/narinfo.rs b/tvix/nar-bridge/src/narinfo.rs
index 76fda1d49..7ad8adee0 100644
--- a/tvix/nar-bridge/src/narinfo.rs
+++ b/tvix/nar-bridge/src/narinfo.rs
@@ -15,7 +15,7 @@ use crate::AppState;
 /// The size limit for NARInfo uploads nar-bridge receives
 const NARINFO_LIMIT: usize = 2 * 1024 * 1024;
 
-#[instrument(skip(path_info_service))]
+#[instrument(skip_all, fields(path_info.name=%narinfo_str))]
 pub async fn head(
     axum::extract::Path(narinfo_str): axum::extract::Path<String>,
     axum::extract::State(AppState {
@@ -41,7 +41,7 @@ pub async fn head(
     }
 }
 
-#[instrument(skip(path_info_service))]
+#[instrument(skip_all, fields(path_info.name=%narinfo_str))]
 pub async fn get(
     axum::extract::Path(narinfo_str): axum::extract::Path<String>,
     axum::extract::State(AppState {
@@ -78,7 +78,7 @@ pub async fn get(
     ))
 }
 
-#[instrument(skip(path_info_service, root_nodes, request))]
+#[instrument(skip_all, fields(path_info.name=%narinfo_str))]
 pub async fn put(
     axum::extract::Path(narinfo_str): axum::extract::Path<String>,
     axum::extract::State(AppState {