diff --git a/crates/binstalk-downloader/src/remote.rs b/crates/binstalk-downloader/src/remote.rs index e32a4ab8..98486a6e 100644 --- a/crates/binstalk-downloader/src/remote.rs +++ b/crates/binstalk-downloader/src/remote.rs @@ -13,7 +13,7 @@ use reqwest::{ Request, }; use thiserror::Error as ThisError; -use tracing::{debug, info}; +use tracing::{debug, info, instrument}; pub use reqwest::{header, Error as ReqwestError, Method, StatusCode}; pub use url::Url; @@ -155,6 +155,7 @@ impl Client { /// /// Return `Ok(ControlFlow::Break(response))` when succeeds and no need /// to retry. + #[instrument] async fn do_send_request( &self, request: Request, @@ -177,7 +178,7 @@ impl Client { let status = response.status(); let add_delay_and_continue = |response: reqwest::Response, duration| { - info!("Receiver status code {status}, will wait for {duration:#?} and retry"); + info!("Received status code {status}, will wait for {duration:#?} and retry"); self.0 .service @@ -237,6 +238,8 @@ impl Client { request: Request, error_for_status: bool, ) -> Result { + debug!("Downloading from: '{}'", request.url()); + self.send_request_inner(&request) .await .and_then(|response| { @@ -313,8 +316,6 @@ impl Client { &self, url: Url, ) -> Result>, Error> { - debug!("Downloading from: '{url}'"); - Ok(self.get(url).send(true).await?.bytes_stream()) } diff --git a/crates/binstalk-registry/src/common.rs b/crates/binstalk-registry/src/common.rs index f3713b1d..7d4a719a 100644 --- a/crates/binstalk-registry/src/common.rs +++ b/crates/binstalk-registry/src/common.rs @@ -14,7 +14,7 @@ use semver::{Version, VersionReq}; use serde::Deserialize; use serde_json::Error as JsonError; use sha2::{Digest, Sha256}; -use tracing::debug; +use tracing::{debug, instrument}; use crate::{visitor::ManifestVisitor, RegistryError}; @@ -37,6 +37,7 @@ impl DataVerifier for Sha256Digest { } } +#[instrument] pub(super) async fn parse_manifest( client: Client, crate_name: &str, diff --git a/crates/binstalk-registry/src/crates_io_registry.rs b/crates/binstalk-registry/src/crates_io_registry.rs index 179b91fd..9857a610 100644 --- a/crates/binstalk-registry/src/crates_io_registry.rs +++ b/crates/binstalk-registry/src/crates_io_registry.rs @@ -4,7 +4,7 @@ use cargo_toml_workspace::cargo_toml::Manifest; use compact_str::{CompactString, ToCompactString}; use semver::{Comparator, Op as ComparatorOp, Version as SemVersion, VersionReq}; use serde::Deserialize; -use tracing::debug; +use tracing::{debug, instrument}; use crate::{parse_manifest, MatchedVersion, RegistryError}; @@ -105,6 +105,7 @@ async fn fetch_crate_cratesio_version_matched( /// Find the crate by name, get its latest stable version matches `version_req`, /// retrieve its Cargo.toml and infer all its bins. +#[instrument] pub async fn fetch_crate_cratesio_api( client: Client, name: &str, diff --git a/crates/binstalk-registry/src/git_registry.rs b/crates/binstalk-registry/src/git_registry.rs index be158567..c68ff1da 100644 --- a/crates/binstalk-registry/src/git_registry.rs +++ b/crates/binstalk-registry/src/git_registry.rs @@ -10,6 +10,7 @@ use serde_json::{from_slice as json_from_slice, Deserializer as JsonDeserializer use simple_git::{GitCancellationToken, GitUrl, Repository}; use tempfile::TempDir; use tokio::task::spawn_blocking; +use tracing::instrument; use url::Url; use crate::{ @@ -96,6 +97,7 @@ impl GitRegistry { ) } + #[instrument] pub async fn fetch_crate_matched( &self, client: Client, diff --git a/crates/binstalk-registry/src/sparse_registry.rs b/crates/binstalk-registry/src/sparse_registry.rs index e03197ad..c30a0fe5 100644 --- a/crates/binstalk-registry/src/sparse_registry.rs +++ b/crates/binstalk-registry/src/sparse_registry.rs @@ -5,6 +5,7 @@ use compact_str::CompactString; use semver::VersionReq; use serde_json::Deserializer as JsonDeserializer; use tokio::sync::OnceCell; +use tracing::instrument; use url::Url; use crate::{ @@ -77,6 +78,7 @@ impl SparseRegistry { ) } + #[instrument] pub async fn fetch_crate_matched( &self, client: Client,