From a740a8f962f67fb62492bdb0be6b7fdc9ab31069 Mon Sep 17 00:00:00 2001
From: Romain LE JEUNE <romain.le.jeune@proton.ch>
Date: Wed, 8 Feb 2023 15:13:15 +0100
Subject: [PATCH] feat(GODT-2278): properly override server_name for go.

---
 internal/sentry/reporter.go | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/internal/sentry/reporter.go b/internal/sentry/reporter.go
index f9697f00..33456d56 100644
--- a/internal/sentry/reporter.go
+++ b/internal/sentry/reporter.go
@@ -43,6 +43,7 @@ func init() { //nolint:gochecknoinits
 		Release:    constants.Revision,
 		BeforeSend: EnhanceSentryEvent,
 		Transport:  sentrySyncTransport,
+		ServerName: getProtectedHostname(),
 	}); err != nil {
 		logrus.WithError(err).Error("Failed to initialize sentry options")
 	}
@@ -63,7 +64,6 @@ type Reporter struct {
 	appVersion string
 	identifier Identifier
 	hostArch   string
-	serverName string
 }
 
 type Identifier interface {
@@ -85,7 +85,6 @@ func NewReporter(appName, appVersion string, identifier Identifier) *Reporter {
 		appVersion: appVersion,
 		identifier: identifier,
 		hostArch:   getHostArch(),
-		serverName: getProtectedHostname(),
 	}
 }
 
@@ -137,12 +136,11 @@ func (r *Reporter) scopedReport(context map[string]interface{}, doReport func())
 	}
 
 	tags := map[string]string{
-		"OS":          runtime.GOOS,
-		"Client":      r.appName,
-		"Version":     r.appVersion,
-		"UserAgent":   r.identifier.GetUserAgent(),
-		"HostArch":    r.hostArch,
-		"server_name": r.serverName,
+		"OS":        runtime.GOOS,
+		"Client":    r.appName,
+		"Version":   r.appVersion,
+		"UserAgent": r.identifier.GetUserAgent(),
+		"HostArch":  r.hostArch,
 	}
 
 	sentry.WithScope(func(scope *sentry.Scope) {