From fa305dea902d1307865763e0ac3e259a58252b29 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 28 Nov 2024 20:47:12 +0200 Subject: [PATCH] feat(tvix/store): set user-agent for NixHTTPPathInfoService MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8eb74c5a9457b88ab51bd88084591a4c7c5cdbcc Reviewed-on: https://cl.tvl.fyi/c/depot/+/12849 Reviewed-by: Domen Kožar Autosubmit: flokli Tested-by: BuildkiteCI Reviewed-by: flokli --- tvix/store/src/lib.rs | 3 +++ tvix/store/src/pathinfoservice/nix_http.rs | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tvix/store/src/lib.rs b/tvix/store/src/lib.rs index e1517609d..5f1642ce2 100644 --- a/tvix/store/src/lib.rs +++ b/tvix/store/src/lib.rs @@ -9,6 +9,9 @@ pub mod utils; #[cfg(test)] mod tests; +// Used as user agent in various HTTP Clients +const USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION")); + // That's what the rstest_reuse README asks us do, and fails about being unable // to find rstest_reuse in crate root. #[cfg(test)] diff --git a/tvix/store/src/pathinfoservice/nix_http.rs b/tvix/store/src/pathinfoservice/nix_http.rs index e9b83dcf3..a9e3e4b36 100644 --- a/tvix/store/src/pathinfoservice/nix_http.rs +++ b/tvix/store/src/pathinfoservice/nix_http.rs @@ -54,9 +54,14 @@ impl NixHTTPPathInfoService { Self { instance_name, base_url, - http_client: reqwest_middleware::ClientBuilder::new(reqwest::Client::new()) - .with(tvix_tracing::propagate::reqwest::tracing_middleware()) - .build(), + http_client: reqwest_middleware::ClientBuilder::new( + reqwest::Client::builder() + .user_agent(crate::USER_AGENT) + .build() + .expect("Client::new()"), + ) + .with(tvix_tracing::propagate::reqwest::tracing_middleware()) + .build(), blob_service, directory_service,