Switch from log to tracing

Given that this library makes use of async code, it's useful to use spans.

Author: djc

Cargo.toml

@@ -20,7 +20,6 @@ base64 = "0.13"
 dirs-next = "2.0"
 hyper = { version = "0.14.2", features = ["client", "runtime", "http2"] }
 hyper-rustls = { version = "0.23.0", default-features = false, features = ["native-tokio", "http1", "http2"] }
-log = "0.4"
 ring = "0.16.20"
 rustls = "0.20.2"
 rustls-pemfile = "0.2.1"
@@ -29,6 +28,7 @@ serde_json = "1.0"
 thiserror = "1.0"
 time = { version = "0.3.5", features = ["serde"] }
 tokio = { version = "1.1", features = ["fs", "sync"] }
+tracing = "0.1.29"
 url = "2"
 which = "4.2"
 

src/authentication_manager.rs

@@ -43,31 +43,31 @@ impl AuthenticationManager {
     /// 4. Look for credentials in `.config/gcloud/application_default_credentials.json`;
     ///    if found, use these credentials to request refresh tokens.
     pub async fn new() -> Result<Self, Error> {
-        log::debug!("Initializing gcp_auth");
+        tracing::debug!("Initializing gcp_auth");
         if let Some(service_account) = CustomServiceAccount::from_env()? {
             return Ok(Self::from_custom_service_account(service_account));
         }
 
         let client = types::client();
         let gcloud_error = match GCloudAuthorizedUser::new() {
             Ok(service_account) => {
-                log::debug!("Using GCloudAuthorizedUser");
+                tracing::debug!("Using GCloudAuthorizedUser");
                 return Ok(Self::build(client, service_account));
             }
             Err(e) => e,
         };
 
         let default_service_error = match DefaultServiceAccount::new(&client).await {
             Ok(service_account) => {
-                log::debug!("Using DefaultServiceAccount");
+                tracing::debug!("Using DefaultServiceAccount");
                 return Ok(Self::build(client, service_account));
             }
             Err(e) => e,
         };
 
         let default_user_error = match DefaultAuthorizedUser::new(&client).await {
             Ok(service_account) => {
-                log::debug!("Using DefaultAuthorizedUser");
+                tracing::debug!("Using DefaultAuthorizedUser");
                 return Ok(Self::build(client, service_account));
             }
             Err(e) => e,

src/custom_service_account.rs

@@ -23,7 +23,7 @@ impl CustomServiceAccount {
     pub fn from_env() -> Result<Option<Self>, Error> {
         std::env::var_os("GOOGLE_APPLICATION_CREDENTIALS")
             .map(|path| {
-                log::debug!("Reading credentials file from GOOGLE_APPLICATION_CREDENTIALS env var");
+                tracing::debug!("Reading credentials file from GOOGLE_APPLICATION_CREDENTIALS env var");
                 Self::from_file(&PathBuf::from(path))
             })
             .transpose()
@@ -100,7 +100,7 @@ impl ServiceAccount for CustomServiceAccount {
             .body(hyper::Body::from(rqbody))
             .unwrap();
 
-        log::debug!("requesting token from service account: {:?}", request);
+        tracing::debug!("requesting token from service account: {:?}", request);
         let token = client
             .request(request)
             .await

src/default_authorized_user.rs

@@ -36,7 +36,7 @@ impl DefaultAuthorizedUser {
     }
 
     async fn get_token(client: &HyperClient) -> Result<Token, Error> {
-        log::debug!("Loading user credentials file");
+        tracing::debug!("Loading user credentials file");
         let mut home = dirs_next::home_dir().ok_or(Error::NoHomeDir)?;
         home.push(Self::USER_CREDENTIALS_PATH);
 

src/default_service_account.rs

@@ -35,7 +35,7 @@ impl DefaultServiceAccount {
     }
 
     async fn get_token(client: &HyperClient) -> Result<Token, Error> {
-        log::debug!("Getting token from GCP instance metadata server");
+        tracing::debug!("Getting token from GCP instance metadata server");
         let req = Self::build_token_request(Self::DEFAULT_TOKEN_GCP_URI);
         let token = client
             .request(req)
@@ -50,7 +50,7 @@ impl DefaultServiceAccount {
 #[async_trait]
 impl ServiceAccount for DefaultServiceAccount {
     async fn project_id(&self, client: &HyperClient) -> Result<String, Error> {
-        log::debug!("Getting project ID from GCP instance metadata server");
+        tracing::debug!("Getting project ID from GCP instance metadata server");
         let req = Self::build_token_request(Self::DEFAULT_PROJECT_ID_GCP_URI);
         let rsp = client.request(req).await.map_err(Error::ConnectionError)?;
 

src/util.rs

@@ -27,7 +27,7 @@ impl HyperExt for hyper::Response<hyper::body::Body> {
                 parts.status,
                 String::from_utf8_lossy(body.as_ref())
             );
-            log::error!("{}", error);
+            tracing::error!("{}", error);
             return Err(Error::ServerUnavailable(error));
         }