From da0e08d72c00666a78a6296bb2d653ca669d4537 Mon Sep 17 00:00:00 2001
From: Shreyas Goenka <shreyas.goenka@databricks.com>
Date: Thu, 27 Feb 2025 12:47:26 +0100
Subject: [PATCH] log to stdout / stderr

---
 .../telemetry/upload-command/out.upload.txt   |  3 ---
 .../telemetry/upload-command/output.txt       |  3 +++
 main.go                                       | 22 ++++---------------
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 acceptance/telemetry/upload-command/out.upload.txt

diff --git a/acceptance/telemetry/upload-command/out.upload.txt b/acceptance/telemetry/upload-command/out.upload.txt
deleted file mode 100644
index 2fd4e3306..000000000
--- a/acceptance/telemetry/upload-command/out.upload.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Telemetry logs uploaded successfully
-Response:
-{"errors":[],"numProtoSuccess":2}
diff --git a/acceptance/telemetry/upload-command/output.txt b/acceptance/telemetry/upload-command/output.txt
index a7a85871b..79c8c1f74 100644
--- a/acceptance/telemetry/upload-command/output.txt
+++ b/acceptance/telemetry/upload-command/output.txt
@@ -1,2 +1,5 @@
 
 >>> [CLI] telemetry upload
+Telemetry logs uploaded successfully
+Response:
+{"errors":[],"numProtoSuccess":2}
diff --git a/main.go b/main.go
index c573e1e58..a1b67cd84 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"os"
 
 	"github.com/databricks/cli/cmd"
@@ -23,19 +22,6 @@ func main() {
 	// of [root.Execute] ensures that the telemetry upload process is not spawned
 	// infinitely in a recursive manner.
 	if len(os.Args) == 3 && os.Args[1] == "telemetry" && os.Args[2] == "upload" {
-		var err error
-
-		// By default, this command should not write anything to stdout or stderr.
-		outW := io.Discard
-		errW := io.Discard
-
-		// If the environment variable is set, redirect stdout to the file.
-		// This is useful for testing.
-		if v := os.Getenv(telemetry.UploadLogsFileEnvVar); v != "" {
-			outW, _ = os.OpenFile(v, os.O_CREATE|os.O_WRONLY, 0o644)
-			errW = outW
-		}
-
 		// Suppress non-error logs from the SDK.
 		logger.DefaultLogger = &logger.SimpleLogger{
 			Level: logger.LevelError,
@@ -43,14 +29,14 @@ func main() {
 
 		resp, err := telemetry.Upload(ctx)
 		if err != nil {
-			fmt.Fprintf(errW, "error: %s\n", err)
+			fmt.Fprintf(os.Stderr, "error: %s\n", err)
 			os.Exit(1)
 		}
-		fmt.Fprintf(outW, "Telemetry logs uploaded successfully\n")
-		fmt.Fprintln(outW, "Response:")
+		fmt.Printf("Telemetry logs uploaded successfully\n")
+		fmt.Println("Response:")
 		b, err := json.Marshal(resp)
 		if err == nil {
-			fmt.Fprintln(outW, string(b))
+			fmt.Println(string(b))
 		}
 		os.Exit(0)
 	}