Merge pull request #390 from blyxxyz/log-dependencies

Enable logging in `rustls` and `tracing`-using dependencies

Author: ducaale

Cargo.lock

@@ -26,6 +26,7 @@ dirs = "5.0"
 encoding_rs = "0.8.28"
 encoding_rs_io = "0.1.7"
 flate2 = "1.0.22"
+# Add "tracing" feature to hyper once it stabilizes
 hyper = { version = "1.2", default-features = false }
 indicatif = "0.17"
 jsonxf = "1.1.0"
@@ -52,6 +53,11 @@ ruzstd = { version = "0.7", default-features = false, features = ["std"]}
 env_logger = { version = "0.11.3", default-features = false, features = ["color", "auto-color", "humantime"] }
 log = "0.4.21"
 
+# Enable logging in transitive dependencies.
+# The rustls version number should be kept in sync with hyper/reqwest.
+rustls = { version = "0.23.14", optional = true, default-features = false, features = ["logging"] }
+tracing = { version = "0.1.41", default-features = false, features = ["log"] }
+
 [dependencies.reqwest]
 version = "0.12.3"
 default-features = false
@@ -85,7 +91,7 @@ http-body-util = "0.1.1"
 [features]
 default = ["online-tests", "rustls", "network-interface"]
 native-tls = ["reqwest/native-tls", "reqwest/native-tls-alpn"]
-rustls = ["reqwest/rustls-tls", "reqwest/rustls-tls-webpki-roots", "reqwest/rustls-tls-native-roots"]
+rustls = ["reqwest/rustls-tls", "reqwest/rustls-tls-webpki-roots", "reqwest/rustls-tls-native-roots", "dep:rustls"]
 
 # To be used by platforms that don't support binding to interface via SO_BINDTODEVICE
 # Ideally, this would be auto-disabled on platforms that don't need it

Cargo.toml

@@ -73,14 +73,15 @@ fn main() {
     log::debug!("{args:#?}");
 
     let native_tls = args.native_tls;
+    let bin_name = args.bin_name.clone();
 
     match run(args) {
         Ok(exit_code) => {
             process::exit(exit_code);
         }
         Err(err) => {
             log::debug!("{err:#?}");
-            log::error!("{err:?}");
+            eprintln!("{bin_name}: error: {err:?}");
             let msg = err.root_cause().to_string();
             if native_tls && msg == "invalid minimum TLS version for backend" {
                 eprintln!();

src/main.rs

@@ -124,3 +124,23 @@ fn warning_for_non_utf8_redirect() {
         .assert()
         .stderr("xh: warning: Redirect to invalid URL: \"\\xff\"\n");
 }
+
+/// This test should fail if rustls's version gets out of sync in Cargo.toml.
+#[cfg(feature = "rustls")]
+#[test]
+fn rustls_emits_logs() {
+    let mut server = server::http(|_req| async move {
+        unreachable!();
+    });
+    server.disable_hit_checks();
+    let cmd = get_command()
+        .arg("--debug")
+        .arg(server.base_url().replace("http://", "https://"))
+        .env_remove("RUST_LOG")
+        .assert()
+        .failure();
+
+    assert!(std::str::from_utf8(&cmd.get_output().stderr)
+        .unwrap()
+        .contains("rustls::"));
+}