diff --git a/cmd/root/root.go b/cmd/root/root.go
index dbe893baf..8e4b1b270 100644
--- a/cmd/root/root.go
+++ b/cmd/root/root.go
@@ -166,35 +166,20 @@ Stack Trace:
 		exitCode = 1
 	}
 
-	uploadTelemetry(cmd.Context(), commandString(cmd), startTime, exitCode)
+	if telemetry.HasLogs(ctx) {
+		err := telemetry.Upload(ctx, ConfigUsed(ctx), protos.ExecutionContext{
+			CmdExecID:       cmdExecId,
+			Version:         build.GetInfo().Version,
+			Command:         commandString(cmd),
+			OperatingSystem: runtime.GOOS,
+			DbrVersion:      env.Get(ctx, dbr.EnvVarName),
+			ExecutionTimeMs: time.Since(startTime).Milliseconds(),
+			ExitCode:        int64(exitCode),
+		})
+		if err != nil {
+			log.Debugf(ctx, "failed to upload telemetry logs: %s", err)
+		}
+	}
+
 	return err
 }
-
-func uploadTelemetry(ctx context.Context, cmdStr string, startTime time.Time, exitCode int) {
-	// Return early if there are no logs to upload.
-	if !telemetry.HasLogs(ctx) {
-		log.Debugf(ctx, "no telemetry logs to upload")
-		return
-	}
-
-	// Telemetry is disabled. We don't upload logs.
-	if env.Get(ctx, telemetry.DisableEnvVar) != "" {
-		log.Debugf(ctx, "telemetry upload is disabled. Not uploading any logs.")
-		return
-	}
-
-	telemetry.SetExecutionContext(ctx, protos.ExecutionContext{
-		CmdExecID:       cmdExecId,
-		Version:         build.GetInfo().Version,
-		Command:         cmdStr,
-		OperatingSystem: runtime.GOOS,
-		DbrVersion:      env.Get(ctx, dbr.EnvVarName),
-		ExecutionTimeMs: time.Since(startTime).Milliseconds(),
-		ExitCode:        int64(exitCode),
-	})
-
-	err := telemetry.Upload(ctx, ConfigUsed(ctx))
-	if err != nil {
-		log.Debugf(ctx, "failed to upload telemetry: %v", err)
-	}
-}
diff --git a/libs/telemetry/logger.go b/libs/telemetry/logger.go
index f2581bf93..df1c969df 100644
--- a/libs/telemetry/logger.go
+++ b/libs/telemetry/logger.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/databricks/cli/libs/env"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/cli/libs/telemetry/protos"
 	"github.com/databricks/databricks-sdk-go/apierr"
@@ -18,18 +19,14 @@ import (
 
 // Environment variable to disable telemetry. If this is set to any value, telemetry
 // will be disabled.
-const DisableEnvVar = "DATABRICKS_CLI_DISABLE_TELEMETRY"
+const disableEnvVar = "DATABRICKS_CLI_DISABLE_TELEMETRY"
 
 func Log(ctx context.Context, event protos.DatabricksCliLog) {
 	fromContext(ctx).log(event)
 }
 
-func SetExecutionContext(ctx context.Context, ec protos.ExecutionContext) {
-	fromContext(ctx).setExecutionContext(ec)
-}
-
 func HasLogs(ctx context.Context) bool {
-	return len(fromContext(ctx).getLogs()) > 0
+	return len(fromContext(ctx).logs) > 0
 }
 
 type logger struct {
@@ -48,25 +45,27 @@ func (l *logger) log(event protos.DatabricksCliLog) {
 	})
 }
 
-func (l *logger) getLogs() []protos.FrontendLog {
-	return l.logs
-}
-
-func (l *logger) setExecutionContext(ec protos.ExecutionContext) {
-	for i := range l.logs {
-		l.logs[i].Entry.DatabricksCliLog.ExecutionContext = &ec
-	}
-}
-
 const (
 	uploadTimeout      = 3 * time.Second
 	waitBetweenRetries = 200 * time.Millisecond
 )
 
-func Upload(ctx context.Context, cfg *config.Config) error {
+func Upload(ctx context.Context, cfg *config.Config, ec protos.ExecutionContext) error {
 	l := fromContext(ctx)
 	if len(l.logs) == 0 {
-		return errors.New("no logs to upload")
+		log.Debugf(ctx, "no telemetry logs to upload")
+		return nil
+	}
+
+	// Telemetry is disabled. We don't upload logs.
+	if env.Get(ctx, disableEnvVar) != "" {
+		log.Debugf(ctx, "telemetry upload is disabled. Not uploading any logs.")
+		return nil
+	}
+
+	// Set the execution context for all logs.
+	for i := range l.logs {
+		l.logs[i].Entry.DatabricksCliLog.ExecutionContext = &ec
 	}
 
 	protoLogs := make([]string, len(l.logs))