GODT-1375: Add host architecture to sentry reports

internal/sentry/hostarch_darwin.go

@@ -0,0 +1,49 @@
+// Copyright (c) 2022 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+//go:build darwin
+// +build darwin
+
+package sentry
+
+import (
+	"github.com/elastic/go-sysinfo"
+	"golang.org/x/sys/unix"
+)
+
+const translatedProcDarwin = "sysctl.proc_translated"
+
+func getHostAarch() string {
+	host, err := sysinfo.Host()
+	if err != nil {
+		return "not-detected"
+	}
+
+	// It is not possible to retrieve real hardware architecture once using
+	// rosetta. But it is possible to detect the process translation if
+	// rosetta is used.
+	res, err := unix.SysctlRaw(translatedProcDarwin)
+	if err != nil || len(res) > 4 {
+		return host.Info().Architecture + "_err"
+	}
+
+	if res[0] == 1 {
+		return host.Info().Architecture + "_rosetta"
+	}
+
+	return host.Info().Architecture
+}

internal/sentry/hostarch_default.go

@@ -0,0 +1,31 @@
+// Copyright (c) 2022 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+//go:build !darwin
+// +build !darwin
+
+package sentry
+
+import "github.com/elastic/go-sysinfo"
+
+func getHostAarch() string {
+	host, err := sysinfo.Host()
+	if err != nil {
+		return "not-detected"
+	}
+	return host.Info().Architecture
+}

internal/sentry/reporter.go

@@ -31,7 +31,7 @@ import (
 
 var skippedFunctions = []string{} //nolint[gochecknoglobals]
 
-func init() { // nolint[noinit]
+func init() { //nolint[noinit, gochecknoinits]
 	if err := sentry.Init(sentry.ClientOptions{
 		Dsn:        constants.DSNSentry,
 		Release:    constants.Revision,
@@ -49,6 +49,7 @@ type Reporter struct {
 	appName    string
 	appVersion string
 	userAgent  fmt.Stringer
+	hostArch   string
 }
 
 // NewReporter creates new sentry reporter with appName and appVersion to report.
@@ -57,6 +58,7 @@ func NewReporter(appName, appVersion string, userAgent fmt.Stringer) *Reporter {
 		appName:    appName,
 		appVersion: appVersion,
 		userAgent:  userAgent,
+		hostArch:   getHostAarch(),
 	}
 }
 
@@ -110,6 +112,7 @@ func (r *Reporter) scopedReport(context map[string]interface{}, doReport func())
 		"Version":   r.appVersion,
 		"UserAgent": r.userAgent.String(),
 		"UserID":    "",
+		"HostArch":  r.hostArch,
 	}
 
 	sentry.WithScope(func(scope *sentry.Scope) {