From 16337d57f336e05a80d35877194747f4dab93217 Mon Sep 17 00:00:00 2001
From: Jamil <jamilbk@users.noreply.github.com>
Date: Thu, 28 Mar 2024 13:51:59 -0700
Subject: [PATCH] refactor(connlib): Reduce log noisiness for GA (#4381)

Fixes #4380
Fixes #4379
---
 kotlin/android/app/build.gradle.kts                          | 2 +-
 rust/Dockerfile                                              | 5 +++--
 rust/connlib/tunnel/src/io.rs                                | 2 +-
 rust/gui-client/src-tauri/src/client/settings.rs             | 2 +-
 scripts/gateway-systemd-install.sh                           | 2 +-
 .../FirezoneKit/Sources/FirezoneKit/Models/Settings.swift    | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts
index 594fe6ebd..6475e3b49 100644
--- a/kotlin/android/app/build.gradle.kts
+++ b/kotlin/android/app/build.gradle.kts
@@ -123,7 +123,7 @@ android {
 
             buildConfigField("String", "AUTH_BASE_URL", "\"https://app.firezone.dev\"")
             buildConfigField("String", "API_URL", "\"wss://api.firezone.dev\"")
-            buildConfigField("String", "LOG_FILTER", "\"info\"")
+            buildConfigField("String", "LOG_FILTER", "\"str0m=warn,info\"")
             firebaseAppDistribution {
                 serviceCredentialsFile = System.getenv("FIREBASE_CREDENTIALS_PATH")
                 artifactType = "AAB"
diff --git a/rust/Dockerfile b/rust/Dockerfile
index d4c88c056..c9d173fbf 100644
--- a/rust/Dockerfile
+++ b/rust/Dockerfile
@@ -90,7 +90,6 @@ COPY . .
 
 ARG TARGET
 ARG PACKAGE
-ENV CONNLIB_LOG_UPLOAD_INTERVAL_SECS=300
 RUN cargo build -p ${PACKAGE} $([ -n "${TARGET}" ] && "--target ${TARGET}")
 
 # Image which is used to run the application binary
@@ -103,7 +102,9 @@ FROM alpine:${ALPINE_VERSION} AS runtime
 ENV REFRESHED_AT=2023-10-23 \
   LANG=C.UTF-8 \
   TERM=xterm \
-  RUST_BACKTRACE=1
+  RUST_BACKTRACE=1 \
+  CONNLIB_LOG_UPLOAD_INTERVAL_SECS=300 \
+  RUST_LOG=str0m=warn,info
 
 WORKDIR /bin
 
diff --git a/rust/connlib/tunnel/src/io.rs b/rust/connlib/tunnel/src/io.rs
index a85aaf315..df3caf4ef 100644
--- a/rust/connlib/tunnel/src/io.rs
+++ b/rust/connlib/tunnel/src/io.rs
@@ -80,7 +80,7 @@ impl Io {
                         Ok(None) => {}
                         Err(_) => {
                             // The error might contain sensitive information therefore we ignore it
-                            tracing::warn!("Failed to build DNS response from lookup result");
+                            tracing::debug!("Failed to build DNS response from lookup result");
                         }
                     }
 
diff --git a/rust/gui-client/src-tauri/src/client/settings.rs b/rust/gui-client/src-tauri/src/client/settings.rs
index 99302bd92..dae425e06 100644
--- a/rust/gui-client/src-tauri/src/client/settings.rs
+++ b/rust/gui-client/src-tauri/src/client/settings.rs
@@ -35,7 +35,7 @@ impl Default for AdvancedSettings {
         Self {
             auth_base_url: Url::parse("https://app.firezone.dev").unwrap(),
             api_url: Url::parse("wss://api.firezone.dev").unwrap(),
-            log_filter: "firezone_gui_client=info,firezone_tunnel=info,phoenix_channel=info,connlib_shared=info,connlib_client_shared=info,boringtun=info,snownet=info,str0m=info,warn".to_string(),
+            log_filter: "str0m=warn,info".to_string(),
         }
     }
 }
diff --git a/scripts/gateway-systemd-install.sh b/scripts/gateway-systemd-install.sh
index 3892304e4..a2739d0c5 100755
--- a/scripts/gateway-systemd-install.sh
+++ b/scripts/gateway-systemd-install.sh
@@ -6,7 +6,7 @@ FIREZONE_NAME=${FIREZONE_NAME:-$hostname}
 FIREZONE_ID=${FIREZONE_ID:-}
 FIREZONE_TOKEN=${FIREZONE_TOKEN:-}
 FIREZONE_API_URL=${FIREZONE_API_URL:-wss://api.firezone.dev}
-RUST_LOG=${RUST_LOG:-info}
+RUST_LOG=${RUST_LOG:-str0m=warn,info}
 
 if [ -z "$FIREZONE_TOKEN" ]; then
     echo "FIREZONE_TOKEN is required"
diff --git a/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Settings.swift b/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Settings.swift
index 5b9918530..49065112b 100644
--- a/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Settings.swift
+++ b/swift/apple/FirezoneKit/Sources/FirezoneKit/Models/Settings.swift
@@ -65,7 +65,7 @@ struct Settings: Equatable {
       Settings(
         authBaseURL: "https://app.firezone.dev",
         apiURL: "wss://api.firezone.dev",
-        logFilter: "info"
+        logFilter: "str0m=warn,info"
       )
     #endif
   }()