config/sentry: Inject properly configured logger

The Sentry configuration logic uses the global logrus logger to log
data, which is discouraged. Convert the code to instead inject a logger
so that we can use a properly configured one.

3 files changed, 8 insertions, 8 deletions

diff --git a/internal/cli/gitaly/serve.go b/internal/cli/gitaly/serve.go
index 302fd880d..14105f72b 100644
--- a/internal/cli/gitaly/serve.go
+++ b/internal/cli/gitaly/serve.go
@@ -122,7 +122,7 @@ func configure(configPath string) (config.Cfg, logrus.FieldLogger, error) {
 
 	logger := log.Configure(os.Stdout, cfg.Logging.Format, cfg.Logging.Level, urlSanitizer)
 
-	sentry.ConfigureSentry(version.GetVersion(), sentry.Config(cfg.Logging.Sentry))
+	sentry.ConfigureSentry(logger, version.GetVersion(), sentry.Config(cfg.Logging.Sentry))
 	cfg.Prometheus.Configure()
 	labkittracing.Initialize(labkittracing.WithServiceName("gitaly"))
 	preloadLicenseDatabase(logger)
diff --git a/internal/cli/praefect/serve.go b/internal/cli/praefect/serve.go
index f528b23d8..5c7696671 100644
--- a/internal/cli/praefect/serve.go
+++ b/internal/cli/praefect/serve.go
@@ -87,7 +87,7 @@ func run(appName string, logger *logrus.Entry, configPath string) error {
 	}
 
 	conf.ConfigureLogger()
-	configure(appName, conf)
+	configure(logger, appName, conf)
 
 	starterConfigs, err := getStarterConfigs(conf)
 	if err != nil {
@@ -146,14 +146,14 @@ func getConfig(logger *logrus.Entry, path string) (config.Config, error) {
 	return conf, nil
 }
 
-func configure(appName string, conf config.Config) {
+func configure(logger logrus.FieldLogger, appName string, conf config.Config) {
 	tracing.Initialize(tracing.WithServiceName(appName))
 
 	if conf.PrometheusListenAddr != "" {
 		conf.Prometheus.Configure()
 	}
 
-	sentry.ConfigureSentry(version.GetVersion(), conf.Sentry)
+	sentry.ConfigureSentry(logger, version.GetVersion(), conf.Sentry)
 }
 
 func server(
diff --git a/internal/gitaly/config/sentry/sentry.go b/internal/gitaly/config/sentry/sentry.go
index 52bba10f6..908725ec1 100644
--- a/internal/gitaly/config/sentry/sentry.go
+++ b/internal/gitaly/config/sentry/sentry.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	sentry "github.com/getsentry/sentry-go"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/panichandler"
 )
 
@@ -15,7 +15,7 @@ type Config struct {
 }
 
 // ConfigureSentry configures the sentry DSN
-func ConfigureSentry(version string, sentryConf Config) {
+func ConfigureSentry(logger logrus.FieldLogger, version string, sentryConf Config) {
 	if sentryConf.DSN == "" {
 		return
 	}
@@ -26,11 +26,11 @@ func ConfigureSentry(version string, sentryConf Config) {
 		Release:     "v" + version,
 	})
 	if err != nil {
-		log.Warnf("Unable to initialize sentry client: %v", err)
+		logger.Warnf("Unable to initialize sentry client: %v", err)
 		return
 	}
 
-	log.Debug("Using sentry logging")
+	logger.Debug("Using sentry logging")
 
 	panichandler.InstallPanicHandler(func(grpcMethod string, _err interface{}) {
 		err, ok := _err.(error)