From 26747f13e06b4e1bf3f647958d0a11e5dc0ed545 Mon Sep 17 00:00:00 2001
From: cce <51567+cce@users.noreply.github.com>
Date: Tue, 29 Jul 2025 16:18:52 -0400
Subject: [PATCH 1/2] update diagcfg to properly pass globalDir to
 ReadTelemetryConfigOrDefault

---
 cmd/diagcfg/telemetry.go | 14 ++++++++++++--
 logging/telemetry.go     |  8 ++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/cmd/diagcfg/telemetry.go b/cmd/diagcfg/telemetry.go
index 8ceae0017d..e6a370ec10 100644
--- a/cmd/diagcfg/telemetry.go
+++ b/cmd/diagcfg/telemetry.go
@@ -55,7 +55,12 @@ func maybeUpdateDataDirFromEnv() {
 
 func readTelemetryConfigOrExit() logging.TelemetryConfig {
 	maybeUpdateDataDirFromEnv()
-	cfg, err := logging.ReadTelemetryConfigOrDefault(dataDir, "")
+	globalDir, err := config.GetGlobalConfigFileRoot()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, telemetryConfigReadError, err)
+		os.Exit(1)
+	}
+	cfg, err := logging.ReadTelemetryConfigOrDefault(dataDir, globalDir)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, telemetryConfigReadError, err)
 		os.Exit(1)
@@ -112,7 +117,12 @@ var telemetryStatusCmd = &cobra.Command{
 	Long:  `Print the node's telemetry status`,
 	Run: func(cmd *cobra.Command, args []string) {
 		maybeUpdateDataDirFromEnv()
-		cfg, err := logging.ReadTelemetryConfigOrDefault(dataDir, "")
+		globalDir, err := config.GetGlobalConfigFileRoot()
+		if err != nil {
+			fmt.Fprintf(os.Stderr, telemetryConfigReadError, err)
+			return
+		}
+		cfg, err := logging.ReadTelemetryConfigOrDefault(dataDir, globalDir)
 
 		// If error loading config, can't disable / no need to disable
 		if err != nil {
diff --git a/logging/telemetry.go b/logging/telemetry.go
index 0009a0a0d4..acdd3f4ddf 100644
--- a/logging/telemetry.go
+++ b/logging/telemetry.go
@@ -89,7 +89,7 @@ func makeTelemetryStateContext(ctx context.Context, cfg TelemetryConfig, hookFac
 }
 
 // ReadTelemetryConfigOrDefault reads telemetry config from file or defaults if no config file found.
-func ReadTelemetryConfigOrDefault(dataDir string, configDir string) (cfg TelemetryConfig, err error) {
+func ReadTelemetryConfigOrDefault(dataDir string, globalDir string) (cfg TelemetryConfig, err error) {
 	err = nil
 	dataDirProvided := dataDir != ""
 	var configPath string
@@ -106,7 +106,7 @@ func ReadTelemetryConfigOrDefault(dataDir string, configDir string) (cfg Telemet
 	// If the reason is because the directory doesn't exist or we didn't provide a data directory then...
 	if (err != nil && os.IsNotExist(err)) || !dataDirProvided {
 
-		configPath = filepath.Join(configDir, TelemetryConfigFilename)
+		configPath = filepath.Join(globalDir, TelemetryConfigFilename)
 		cfg, err = LoadTelemetryConfig(configPath)
 	}
 
@@ -129,8 +129,8 @@ func ReadTelemetryConfigOrDefault(dataDir string, configDir string) (cfg Telemet
 // EnsureTelemetryConfig creates a new TelemetryConfig structure with a generated GUID and the appropriate Telemetry endpoint
 // Err will be non-nil if the file doesn't exist, or if error loading.
 // Cfg will always be valid.
-func EnsureTelemetryConfig(dataDir *string, configDir *string) (TelemetryConfig, error) {
-	cfg, _, err := EnsureTelemetryConfigCreated(dataDir, configDir)
+func EnsureTelemetryConfig(dataDir *string, globalDir *string) (TelemetryConfig, error) {
+	cfg, _, err := EnsureTelemetryConfigCreated(dataDir, globalDir)
 	return cfg, err
 }
 

From bafc019bc7ebd578ba4780d267cbfbf8642cb447 Mon Sep 17 00:00:00 2001
From: cce <51567+cce@users.noreply.github.com>
Date: Tue, 29 Jul 2025 16:48:36 -0400
Subject: [PATCH 2/2] Update cmd/diagcfg/telemetry.go

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 cmd/diagcfg/telemetry.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/diagcfg/telemetry.go b/cmd/diagcfg/telemetry.go
index e6a370ec10..c04481319c 100644
--- a/cmd/diagcfg/telemetry.go
+++ b/cmd/diagcfg/telemetry.go
@@ -120,7 +120,7 @@ var telemetryStatusCmd = &cobra.Command{
 		globalDir, err := config.GetGlobalConfigFileRoot()
 		if err != nil {
 			fmt.Fprintf(os.Stderr, telemetryConfigReadError, err)
-			return
+			os.Exit(1)
 		}
 		cfg, err := logging.ReadTelemetryConfigOrDefault(dataDir, globalDir)