From 423ffb0af8ead7f431349c07e2d1fe94d657e676 Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Mon, 24 Apr 2023 13:25:25 -0700 Subject: [PATCH] set default `trust_dns` log level to `ERROR` (#2393) Since upstream has yet to release a version with PR bluejekyll/trust-dns#1881, this commit changes the proxy's default log level to silence warnings from `trust_dns_proto` that are generally spurious. See linkerd/linkerd2#10123 for details. --- Dockerfile | 2 +- linkerd/tracing/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9d2649e9..90a30c5dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,5 +41,5 @@ RUN --mount=type=cache,id=target,target=target \ FROM $RUNTIME_IMAGE as runtime WORKDIR /linkerd COPY --from=build /out/linkerd2-proxy /usr/lib/linkerd/linkerd2-proxy -ENV LINKERD2_PROXY_LOG=warn,linkerd=info +ENV LINKERD2_PROXY_LOG=warn,linkerd=info,trust_dns=error # Inherits the ENTRYPOINT from the runtime image. diff --git a/linkerd/tracing/src/lib.rs b/linkerd/tracing/src/lib.rs index 97c198f78..f6e8221cf 100644 --- a/linkerd/tracing/src/lib.rs +++ b/linkerd/tracing/src/lib.rs @@ -26,7 +26,7 @@ const ENV_LOG_LEVEL: &str = "LINKERD2_PROXY_LOG"; const ENV_LOG_FORMAT: &str = "LINKERD2_PROXY_LOG_FORMAT"; const ENV_ACCESS_LOG: &str = "LINKERD2_PROXY_ACCESS_LOG"; -const DEFAULT_LOG_LEVEL: &str = "warn,linkerd=info"; +const DEFAULT_LOG_LEVEL: &str = "warn,linkerd=info,trust_dns=error"; const DEFAULT_LOG_FORMAT: &str = "PLAIN"; #[derive(Debug, Default)]