tracing: use Options as tracing values (#1299)

Tracing 0.1.29 added a `tracing::field::Value` implementation for
`Option<T> where T: Value`. This means that `Option`s can now be used as
structured field values, rather than recording them with `fmt::Debug`.
When the `Option` is `None`, the field will simply be skipped.

This allows us to make a bunch of existing code simpler. There are a
number of places where we create one span or event if some value is
`Some`, and a different span/event without that field if the value is
`None`. This can be changed to just use the `Option` as a field value
directly.

I'm almost certain I missed some of those places, but I changed the ones
I could find.

This also updates `tracing` to 0.1.29, of course.

(cherry picked from commit 87434bc)
Signed-off-by: Oliver Gould <[email protected]>

Author: hawkw

Cargo.lock

@@ -2310,9 +2310,9 @@ dependencies = [
 
 [[package]]
 name = "tracing"
-version = "0.1.28"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84f96e095c0c82419687c20ddf5cb3eadb61f4e1405923c9dc8e53a1adacbda8"
+checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
 dependencies = [
  "cfg-if",
  "log",
@@ -2323,9 +2323,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.16"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98863d0dd09fa59a1b79c6750ad80dbda6b75f4e71c437a6a1a8cb91a8bcbd77"
+checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2334,9 +2334,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.20"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46125608c26121c81b0c6d693eab5a420e416da7e43c426d2e8f7df8da8a3acf"
+checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
 dependencies = [
  "lazy_static",
 ]

linkerd/addr/fuzz/Cargo.toml

@@ -12,7 +12,7 @@ cargo-fuzz = true
 libfuzzer-sys = "0.4"
 linkerd-addr = { path = ".." }
 linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
-tracing = "0.1.26"
+tracing = "0.1.29"
 
 # Prevent this from interfering with workspaces
 [workspace]

linkerd/app/Cargo.toml

@@ -29,4 +29,4 @@ tokio = { version = "1", features = ["rt"] }
 tokio-stream = { version = "0.1.7", features = ["time", "sync"] }
 tonic = { version = "0.5", default-features = false, features = ["prost"] }
 tower = "0.4.8"
-tracing = "0.1.28"
+tracing = "0.1.29"

linkerd/app/core/Cargo.toml

@@ -65,7 +65,7 @@ thiserror = "1.0"
 tokio = { version = "1", features = ["macros", "sync", "parking_lot"]}
 tokio-stream = { version = "0.1.7", features = ["time"] }
 tonic = { version = "0.5", default-features = false, features = ["prost"] }
-tracing = "0.1.28"
+tracing = "0.1.29"
 parking_lot = "0.11"
 pin-project = "1"
 

linkerd/app/gateway/Cargo.toml

@@ -15,7 +15,7 @@ linkerd-app-outbound = { path = "../outbound" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["sync"] }
 tower = { version = "0.4.8", default-features = false }
-tracing = "0.1.28"
+tracing = "0.1.29"
 
 [dev-dependencies]
 tokio = { version = "1", features = ["rt", "macros"] }

linkerd/app/inbound/Cargo.toml

@@ -22,7 +22,7 @@ thiserror = "1.0"
 tokio = { version = "1", features = ["sync"] }
 tonic = { version = "0.5", default-features = false }
 tower = { version = "0.4.8", features = ["util"] }
-tracing = "0.1.28"
+tracing = "0.1.29"
 
 [target.'cfg(fuzzing)'.dependencies]
 hyper = { version = "0.14.13", features = ["http1", "http2"] }

linkerd/app/inbound/fuzz/test.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set +x
+CARGO=$(which cargo)
+timeout 10m $CARGO fuzz build

linkerd/app/inbound/src/http/router.rs

@@ -219,11 +219,12 @@ impl<C> Inbound<C> {
                         .push(http::BoxResponse::layer()),
                 )
                 .check_new_service::<Logical, http::Request<http::BoxBody>>()
-                .instrument(|t: &Logical| match (t.http, t.logical.as_ref()) {
-                    (http::Version::H2, None) => debug_span!("http2"),
-                    (http::Version::H2, Some(name)) => debug_span!("http2", %name),
-                    (http::Version::Http1, None) => debug_span!("http1"),
-                    (http::Version::Http1, Some(name)) => debug_span!("http1", %name),
+                .instrument(|t: &Logical| {
+                    let name = t.logical.as_ref().map(tracing::field::display);
+                    match t.http {
+                        http::Version::H2 => debug_span!("http2", name),
+                        http::Version::Http1 => debug_span!("http1", name),
+                    }
                 })
                 // Routes each request to a target, obtains a service for that target, and
                 // dispatches the request. NewRouter moves the NewService into the service type, so

linkerd/app/integration/Cargo.toml

@@ -36,7 +36,7 @@ tokio-stream = { version = "0.1.7", features = ["sync"] }
 tokio-rustls = "0.22"
 tower = { version = "0.4.8", default-features = false }
 tonic = { version = "0.5", default-features = false }
-tracing = "0.1.28"
+tracing = "0.1.29"
 webpki = "0.21"
 tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt"] }
 

linkerd/app/outbound/Cargo.toml

@@ -25,7 +25,7 @@ parking_lot = "0.11"
 thiserror = "1.0"
 tokio = { version = "1", features = ["sync"] }
 tower = { version = "0.4.8", features = ["util"] }
-tracing = "0.1.28"
+tracing = "0.1.29"
 pin-project = "1"
 
 [dev-dependencies]

linkerd/app/outbound/src/http/proxy_connection_close.rs

@@ -90,15 +90,14 @@ impl<B, F: TryFuture<Ok = http::Response<B>>> Future for ResponseFuture<F> {
             if proxy_conn == "close" {
                 match rsp.extensions().get::<tls::ConditionalClientTls>() {
                     Some(tls::ConditionalClientTls::Some(_)) => {
-                        if let Some(error) = rsp
-                            .headers()
-                            .get(L5D_PROXY_ERROR)
-                            .and_then(|v| v.to_str().ok())
-                        {
-                            tracing::info!(%error, "Closing application connection for remote proxy");
-                        } else {
-                            tracing::info!("Closing application connection for remote proxy");
-                        }
+                        tracing::info!(
+                            error = rsp
+                                .headers()
+                                .get(L5D_PROXY_ERROR)
+                                .and_then(|v| v.to_str().ok())
+                                .map(tracing::field::display),
+                            "Closing application connection for remote proxy"
+                        );
 
                         if rsp.version() == http::Version::HTTP_11 {
                             // If the response is HTTP/1.1, we need to send a Connection: close

linkerd/app/outbound/src/tcp/logical.rs

@@ -8,7 +8,7 @@ use linkerd_app_core::{
         resolve::map_endpoint,
         tcp,
     },
-    svc, Conditional, Error, Infallible,
+    svc, Error, Infallible,
 };
 use tracing::debug_span;
 
@@ -66,13 +66,12 @@ where
 
             connect
                 .push_make_thunk()
-                .instrument(|t: &Endpoint| match t.tls.as_ref() {
-                    Conditional::Some(tls) => {
-                        debug_span!("endpoint", server.addr = %t.addr, server.id = ?tls.server_id)
-                    }
-                    Conditional::None(_) => {
-                        debug_span!("endpoint", server.addr = %t.addr)
-                    }
+                .instrument(|t: &Endpoint| {
+                    debug_span!(
+                        "endpoint",
+                        server.addr = %t.addr,
+                        server.id = t.tls.value().map(|tls| tracing::field::display(&tls.server_id)),
+                    )
                 })
                 .push(resolve::layer(resolve, config.proxy.cache_max_idle_age * 2))
                 .push_on_service(

linkerd/app/test/Cargo.toml

@@ -30,6 +30,6 @@ tokio = { version = "1", features = ["io-util", "net", "rt", "sync"]}
 tokio-test = "0.4"
 tokio-stream = { version = "0.1.7", features = ["sync"] }
 tower = { version = "0.4.8", default-features = false}
-tracing = "0.1.28"
+tracing = "0.1.29"
 tracing-subscriber = { version = "0.2.24", features = ["env-filter", "fmt"], default-features = false }
 thiserror = "1"

linkerd/cache/Cargo.toml

@@ -13,7 +13,7 @@ linkerd-stack = { path = "../stack" }
 parking_lot = "0.11"
 tokio = { version = "1", default-features = false, features = ["rt", "sync", "time"] }
 tower = { version = "0.4.8", default-features = false, features = ["util"] }
-tracing = "0.1.28"
+tracing = "0.1.29"
 
 [dev-dependencies]
 tokio = { version = "1", default-features = false, features = ["macros", "test-util", "time"] }

linkerd/detect/Cargo.toml

@@ -15,4 +15,4 @@ linkerd-stack = { path = "../stack" }
 tokio = { version = "1", features = ["time"] }
 thiserror = "1.0"
 tower = "0.4.8"
-tracing = "0.1.28"
+tracing = "0.1.29"

linkerd/dns/Cargo.toml

@@ -11,7 +11,7 @@ futures = { version = "0.3", default-features = false }
 linkerd-dns-name = { path = "./name" }
 linkerd-error = { path = "../error" }
 thiserror = "1.0"
-tracing = "0.1.28"
+tracing = "0.1.29"
 trust-dns-resolver = "0.21.0-alpha.3"
 tokio = { version = "1", features = ["rt", "sync", "time"] }
 pin-project = "1"

linkerd/dns/fuzz/Cargo.toml

@@ -13,7 +13,7 @@ cargo-fuzz = true
 libfuzzer-sys = "0.4"
 linkerd-dns = { path = ".." }
 tokio = { version = "1", features = ["rt", "time", "io-util"] }
-tracing = "0.1.26"
+tracing = "0.1.29"
 linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
 
 # Prevent this from interfering with workspaces

linkerd/duplex/Cargo.toml

@@ -11,5 +11,5 @@ bytes = "1"
 futures = { version = "0.3", default-features = false }
 tokio = { version = "1", features = ["io-util"] }
 pin-project = "1"
-tracing = "0.1.28"
+tracing = "0.1.29"
 linkerd-io = { path = "../io" }

linkerd/http-metrics/Cargo.toml

@@ -19,4 +19,4 @@ linkerd-stack = { path = "../stack" }
 parking_lot = "0.11"
 pin-project = "1"
 tower = "0.4.8"
-tracing = "0.1.28"
+tracing = "0.1.29"

linkerd/http-retry/Cargo.toml

@@ -14,7 +14,7 @@ http = "0.2"
 linkerd-error = { path = "../error" }
 pin-project = "1"
 parking_lot = "0.11"
-tracing = "0.1.28"
+tracing = "0.1.29"
 thiserror = "1"
 
 [dev-dependencies]

linkerd/identity/Cargo.toml

@@ -14,7 +14,7 @@ linkerd-dns-name = { path = "../dns/name" }
 ring = "0.16.19"
 thiserror = "1.0"
 tokio-rustls = "0.22"
-tracing = "0.1.28"
+tracing = "0.1.29"
 untrusted = "0.7"
 webpki = "=0.21.4"
 

linkerd/metrics/Cargo.toml

@@ -19,7 +19,7 @@ hyper = { version = "0.14.13", features = ["http1", "http2"] }
 linkerd-stack = { path = "../stack", optional = true }
 parking_lot = "0.11"
 tokio = { version = "1", features = ["time"], optional = true }
-tracing = "0.1.28"
+tracing = "0.1.29"
 
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }

linkerd/opencensus/Cargo.toml

@@ -17,4 +17,4 @@ tonic = { version = "0.5", default-features = false, features = ["prost", "codeg
 tower = { version = "0.4.8", default-features = false }
 tokio = { version = "1", features = ["macros", "sync", "time"] }
 tokio-stream = { version = "0.1.7", features = ["sync"] }
-tracing = "0.1.28"
+tracing = "0.1.29"

linkerd/proxy/api-resolve/Cargo.toml

@@ -27,4 +27,4 @@ pin-project = "1"
 prost = "0.8"
 tonic = { version = "0.5", default-features = false }
 tower = { version = "0.4.8", default-features = false }
-tracing = "0.1.28"
+tracing = "0.1.29"

linkerd/proxy/discover/Cargo.toml

@@ -18,7 +18,7 @@ linkerd-stack = { path = "../../stack" }
 tokio = { version = "1", features = ["sync", "time"] }
 tokio-util = "0.6.8"
 tower = { version = "0.4.8", features = ["discover"] }
-tracing = "0.1.28"
+tracing = "0.1.29"
 pin-project = "1"
 
 [dev-dependencies]

linkerd/proxy/dns-resolve/Cargo.toml

@@ -19,4 +19,4 @@ linkerd-stack = { path = "../../stack" }
 tokio = { version = "1", features = ["sync"] }
 tokio-stream = { version = "0.1.7", features = ["sync"]}
 tower = "0.4.8"
-tracing = "0.1.28"
+tracing = "0.1.29"

linkerd/proxy/http/Cargo.toml

@@ -33,7 +33,7 @@ rand = "0.8"
 thiserror = "1.0"
 tokio = { version = "1", features = ["time", "rt"] }
 tower = { version = "0.4.8", default-features = false, features = ["balance", "load", "discover"] }
-tracing = "0.1.28"
+tracing = "0.1.29"
 try-lock = "0.2"
 pin-project = "1"
 

linkerd/proxy/identity/Cargo.toml

@@ -20,6 +20,6 @@ linkerd-tls = { path = "../../tls" }
 thiserror = "1"
 tokio = { version = "1", features = ["time", "sync"] }
 tonic = { version = "0.5", default-features = false }
-tracing = "0.1.28"
+tracing = "0.1.29"
 http-body = "0.4"
 pin-project = "1"

linkerd/proxy/tap/Cargo.toml

@@ -29,7 +29,7 @@ thiserror = "1.0"
 tokio = { version = "1", features = ["time"]}
 tower = { version = "0.4.8", default-features = false }
 tonic = { version = "0.5", default-features = false }
-tracing = "0.1.28"
+tracing = "0.1.29"
 pin-project = "1"
 
 [dev-dependencies]

linkerd/proxy/transport/Cargo.toml

@@ -16,7 +16,7 @@ linkerd-stack = { path = "../../stack" }
 socket2 = "0.4"
 tokio = { version = "1", features = ["macros", "net"] }
 tokio-stream = { version = "0.1", features = ["net"] }
-tracing = "0.1.28"
+tracing = "0.1.29"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 libc = "0.2"

linkerd/reconnect/Cargo.toml

@@ -11,7 +11,7 @@ linkerd-error = { path = "../error" }
 linkerd-stack = { path = "../stack" }
 futures = { version = "0.3", default-features = false }
 tower = { version = "0.4.8", default-features = false }
-tracing = "0.1.28"
+tracing = "0.1.29"
 pin-project = "1"
 
 [dev-dependencies]

linkerd/retry/Cargo.toml

@@ -11,4 +11,4 @@ linkerd-error = { path = "../error" }
 linkerd-stack = { path = "../stack" }
 pin-project = "1"
 tower = { version = "0.4.8", default-features = false, features = ["retry"] }
-tracing = "0.1.28"
+tracing = "0.1.29"

linkerd/service-profiles/Cargo.toml

@@ -33,7 +33,7 @@ tokio-stream = { version = "0.1", features = ["sync"] }
 tonic = { version = "0.5", default-features = false }
 tower = { version = "0.4.8", features = [ "ready-cache", "retry", "util"] }
 thiserror = "1"
-tracing = "0.1.28"
+tracing = "0.1.29"
 pin-project = "1"
 
 [dev-dependencies]

linkerd/signal/Cargo.toml

@@ -8,4 +8,4 @@ publish = false
 
 [dependencies]
 tokio = { version = "1", features = ["macros", "signal"] }
-tracing = "0.1.28"
+tracing = "0.1.29"

linkerd/stack/tracing/Cargo.toml

@@ -11,4 +11,4 @@ futures = { version = "0.3", default-features = false }
 linkerd-error = { path = "../../error" }
 linkerd-stack = { path = ".." }
 tower = "0.4.8"
-tracing = "0.1.28"
+tracing = "0.1.29"

linkerd/tls/Cargo.toml

@@ -20,7 +20,7 @@ thiserror = "1.0"
 tokio = { version = "1", features = ["macros", "time"] }
 tokio-rustls = "0.22"
 tower = "0.4.8"
-tracing = "0.1.28"
+tracing = "0.1.29"
 webpki = "0.21"
 untrusted = "0.7"
 

linkerd/tracing/Cargo.toml

@@ -13,7 +13,7 @@ ansi = ["tracing-subscriber/ansi"]
 [dependencies]
 linkerd-error = { path = "../error" }
 tokio = { version = "1", features = ["time"] }
-tracing = "0.1.28"
+tracing = "0.1.29"
 tracing-log = "0.1.2"
 
 [dependencies.tracing-subscriber]

linkerd/transport-header/Cargo.toml

@@ -16,7 +16,7 @@ linkerd-io = { path = "../io" }
 linkerd-stack = { path = "../stack" }
 prost = "0.8"
 tokio = { version = "1", features = ["time"] }
-tracing = "0.1.28"
+tracing = "0.1.29"
 
 [build-dependencies]
 prost-build = { version = "0.8", default-features = false }

linkerd/transport-header/fuzz/Cargo.toml

@@ -13,7 +13,7 @@ arbitrary = { version = "1", features = ["derive"] }
 libfuzzer-sys = { version = "0.4.2", features = ["arbitrary-derive"] }
 linkerd-transport-header = { path = ".." }
 tokio = { version = "1", features = ["full"] }
-tracing = "0.1.26"
+tracing = "0.1.29"
 linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
 
 # Prevent this from interfering with workspaces

linkerd/transport-metrics/Cargo.toml

@@ -15,4 +15,4 @@ linkerd-metrics = { path = "../metrics" }
 linkerd-stack = { path = "../stack" }
 parking_lot = "0.11"
 pin-project = "1"
-tracing = "0.1.28"
+tracing = "0.1.29"