Prevent segment from writing to console (especially for pi-hole), fixes

#1968, fixes #1767, fixes #1967 (#2497)

Also adds architecture into segment reporting.

cmd/ddev/cmd/root.go

@@ -191,7 +191,9 @@ func checkDdevVersionAndOptInInstrumentation() error {
 		allowStats := util.Confirm("It looks like you have a new ddev release.\nMay we send anonymous ddev usage statistics and errors?\nTo know what we will see please take a look at\nhttps://ddev.readthedocs.io/en/stable/users/cli-usage/#opt-in-usage-information\nPermission to beam up?")
 		if allowStats {
 			globalconfig.DdevGlobalConfig.InstrumentationOptIn = true
-			client := analytics.New(version.SegmentKey)
+			client, _ := analytics.NewWithConfig(version.SegmentKey, analytics.Config{
+				Logger: &ddevapp.SegmentNoopLogger{},
+			})
 			defer func() {
 				_ = client.Close()
 			}()

pkg/ddevapp/instrumentation.go

@@ -21,6 +21,12 @@ import (
 
 var hashedHostID string
 
+// Define a no-op logger to prevent Segment log messages from being emitted
+type SegmentNoopLogger struct{}
+
+func (n *SegmentNoopLogger) Logf(format string, args ...interface{})   {}
+func (n *SegmentNoopLogger) Errorf(format string, args ...interface{}) {}
+
 // ReportableEvents is the list of events that we choose to report specifically.
 // Excludes non-ddev custom commands.
 var ReportableEvents = map[string]bool{"auth": true, "composer": true, "config": true, "debug": true, "delete": true, "describe": true, "exec": true, "export-db": true, "import-db": true, "import-files": true, "launch": true, "list": true, "logs": true, "mysql": true, "pause": true, "poweroff": true, "pull": true, "restart": true, "restore-snapshot": true, "sequelace": true, "sequelpro": true, "share": true, "snapshot": true, "ssh": true, "start": true, "stop": true, "xdebug": true}
@@ -43,6 +49,7 @@ func SetInstrumentationBaseTags() {
 		lang := os.Getenv("LANG")
 
 		nodeps.InstrumentationTags["OS"] = runtime.GOOS
+		nodeps.InstrumentationTags["architecture"] = runtime.GOARCH
 		wslDistro := nodeps.GetWSLDistro()
 		if wslDistro != "" {
 			nodeps.InstrumentationTags["isWSL"] = "true"
@@ -131,7 +138,9 @@ func SendInstrumentationEvents(event string) {
 	defer runTime()
 
 	if globalconfig.DdevGlobalConfig.InstrumentationOptIn && globalconfig.IsInternetActive() {
-		client := analytics.New(version.SegmentKey)
+		client, _ := analytics.NewWithConfig(version.SegmentKey, analytics.Config{
+			Logger: &SegmentNoopLogger{},
+		})
 
 		err := SegmentEvent(client, GetInstrumentationUser(), event)
 		if err != nil {