From fa237a20f7740b8f1844b54ed5d646c9e2bf1391 Mon Sep 17 00:00:00 2001
From: Toni Spets <toni.spets@beeper.com>
Date: Mon, 9 Jun 2025 09:28:32 +0300
Subject: [PATCH] logging: Move gotd debug logs to trace

Zap doesn't have trace level logging so to make it less noisy we need to
shift them to trace.
---
 go.mod                  |  2 +-
 go.sum                  |  4 ++--
 pkg/connector/client.go | 16 ++++++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/go.mod b/go.mod
index dea82a2d..3c298379 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/tidwall/gjson v1.18.0
 	go.mau.fi/util v0.8.7
 	go.mau.fi/webp v0.2.0
-	go.mau.fi/zerozap v0.1.1
+	go.mau.fi/zerozap v0.1.2
 	go.uber.org/zap v1.27.0
 	golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
 	golang.org/x/net v0.40.0
diff --git a/go.sum b/go.sum
index 16ad7723..6f1c00e1 100644
--- a/go.sum
+++ b/go.sum
@@ -82,8 +82,8 @@ go.mau.fi/webp v0.2.0 h1:QVMenHw7JDb4vall5sV75JNBQj9Hw4u8AKbi1QetHvg=
 go.mau.fi/webp v0.2.0/go.mod h1:VSg9MyODn12Mb5pyG0NIyNFhujrmoFSsZBs8syOZD1Q=
 go.mau.fi/zeroconfig v0.1.3 h1:As9wYDKmktjmNZW5i1vn8zvJlmGKHeVxHVIBMXsm4kM=
 go.mau.fi/zeroconfig v0.1.3/go.mod h1:NcSJkf180JT+1IId76PcMuLTNa1CzsFFZ0nBygIQM70=
-go.mau.fi/zerozap v0.1.1 h1:mxE/dW4wtkqBYOXOEEzXldk5qKB+ahsZXjoTGnvEhZQ=
-go.mau.fi/zerozap v0.1.1/go.mod h1:eRYfQIyL4nTvxaBtVoFqfhdd2vp7pxiHdtvMy2w7XVg=
+go.mau.fi/zerozap v0.1.2 h1:ffH+8kPveX1qE0IbzeBu4pJ15vwp7Sz3H13qlZ1myGs=
+go.mau.fi/zerozap v0.1.2/go.mod h1:I+w0ErpJijmc7q/63ns98W1jkBqF8iXwAe1krrd1IHU=
 go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
 go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
 go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
diff --git a/pkg/connector/client.go b/pkg/connector/client.go
index d419a1ff..ef717161 100644
--- a/pkg/connector/client.go
+++ b/pkg/connector/client.go
@@ -37,6 +37,7 @@ import (
 	"go.mau.fi/util/exsync"
 	"go.mau.fi/zerozap"
 	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
 	"maunium.net/go/mautrix/bridgev2"
 	"maunium.net/go/mautrix/bridgev2/database"
 	"maunium.net/go/mautrix/bridgev2/networkid"
@@ -151,7 +152,18 @@ func NewTelegramClient(ctx context.Context, tc *TelegramConnector, login *bridge
 		Str("user_login_id", string(login.ID)).
 		Logger()
 
-	zaplog := zap.New(zerozap.New(log))
+	zaplog := zap.New(zerozap.NewWithLevels(log, map[zapcore.Level]zerolog.Level{
+		// shifted
+		zapcore.DebugLevel: zerolog.TraceLevel,
+		zapcore.InfoLevel:  zerolog.DebugLevel,
+
+		// direct mapping
+		zapcore.WarnLevel:   zerolog.WarnLevel,
+		zapcore.ErrorLevel:  zerolog.ErrorLevel,
+		zapcore.DPanicLevel: zerolog.PanicLevel,
+		zapcore.PanicLevel:  zerolog.PanicLevel,
+		zapcore.FatalLevel:  zerolog.FatalLevel,
+	}))
 
 	client := TelegramClient{
 		ScopedStore: tc.Store.GetScopedStore(telegramUserID),
@@ -441,7 +453,7 @@ func (t *TelegramClient) sendBadCredentialsOrUnknownError(err error) {
 
 func (t *TelegramClient) onPing() {
 	if t.userLogin.BridgeState.GetPrev().StateEvent == status.StateConnected {
-		t.main.Bridge.Log.Info().Msg("Got ping, not checking connectivity because we are already connected")
+		t.main.Bridge.Log.Trace().Msg("Got ping, not checking connectivity because we are already connected")
 	} else {
 		t.onConnectionStateChange("ping while not connected")
 	}