fix: avoid hang before command exit of jaeger paths

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>

Author: zimeg

internal/config/dotenv.go

@@ -19,9 +19,18 @@ import (
 
 	"github.com/joho/godotenv"
 	"github.com/slackapi/slack-cli/internal/pkg/version"
+	"github.com/slackapi/slack-cli/internal/shared/types"
 	"github.com/spf13/afero"
 )
 
+// IsTelemetryDisabled checks environment variables to determine if telemetry
+// should be disabled. This can be called before Config is initialized.
+func IsTelemetryDisabled(os types.Os) bool {
+	var disableTelemetry = strings.TrimSpace(os.Getenv(slackDisableTelemetryEnv))
+	var testVersion = strings.TrimSpace(os.Getenv(version.EnvTestVersion))
+	return (disableTelemetry != "" && disableTelemetry != "false" && disableTelemetry != "0") || testVersion != ""
+}
+
 // GetDotEnvFileVariables collects only the variables in the .env file
 func (c *Config) GetDotEnvFileVariables() (map[string]string, error) {
 	variables := map[string]string{}
@@ -60,9 +69,7 @@ func (c *Config) LoadEnvironmentVariables() error {
 	}
 
 	// Disable telemetry if either disable-telemetry or test-version environment variables
-	var disableTelemetry = strings.TrimSpace(c.os.Getenv(slackDisableTelemetryEnv))
-	var testVersion = strings.TrimSpace(c.os.Getenv(version.EnvTestVersion))
-	if (disableTelemetry != "" && disableTelemetry != "false" && disableTelemetry != "0") || testVersion != "" {
+	if IsTelemetryDisabled(c.os) {
 		c.DisableTelemetryFlag = true
 	}
 

internal/slackcontext/slackcontext_test.go

@@ -112,7 +112,7 @@ func Test_SlackContext_SetOpenTracingTraceID(t *testing.T) {
 }
 
 func Test_SlackContext_OpenTracingTracer(t *testing.T) {
-	_, _tracer := tracer.SetupTracer(true)
+	_, _tracer := tracer.SetupTracer(true, false)
 
 	tests := map[string]struct {
 		expectedTracer opentracing.Tracer
@@ -139,7 +139,7 @@ func Test_SlackContext_OpenTracingTracer(t *testing.T) {
 }
 
 func Test_SlackContext_SetOpenTracingTracer(t *testing.T) {
-	_, _tracer := tracer.SetupTracer(true)
+	_, _tracer := tracer.SetupTracer(true, false)
 
 	tests := map[string]struct {
 		expectedTracer opentracing.Tracer

internal/tracer/tracer.go

@@ -24,7 +24,7 @@ import (
 )
 
 // SetupTracer sets up the tracer to send data to honeycomb
-func SetupTracer(isDev bool) (io.Closer, opentracing.Tracer) {
+func SetupTracer(isDev bool, disableTelemetry bool) (io.Closer, opentracing.Tracer) {
 	var collectorEndpoint = "https://slackb.com/traces/v1/jaeger"
 	if isDev {
 		collectorEndpoint = "https://dev.slackb.com/traces/v1/jaeger"
@@ -33,7 +33,7 @@ func SetupTracer(isDev bool) (io.Closer, opentracing.Tracer) {
 	// Recommended configuration for production.
 	var jCfg = jaegercfg.Configuration{
 		ServiceName: "slack-cli", // Don't change this.  Required to distinguish logs & traces coming from the CLI
-		Disabled:    false,
+		Disabled:    disableTelemetry,
 		Reporter: &jaegercfg.ReporterConfig{
 			LogSpans:            false,
 			CollectorEndpoint:   collectorEndpoint,

main.go

@@ -19,11 +19,14 @@ import (
 	"os"
 	"runtime/debug"
 	"strings"
+	"time"
 
 	"github.com/google/uuid"
 	"github.com/opentracing/opentracing-go"
 	"github.com/slackapi/slack-cli/cmd"
+	"github.com/slackapi/slack-cli/internal/config"
 	"github.com/slackapi/slack-cli/internal/goutils"
+	"github.com/slackapi/slack-cli/internal/slackdeps"
 	"github.com/slackapi/slack-cli/internal/iostreams"
 	"github.com/slackapi/slack-cli/internal/ioutils"
 	"github.com/slackapi/slack-cli/internal/pkg/version"
@@ -43,8 +46,18 @@ func main() {
 	//      - This would allow us to choose the correct API host based on flags
 	//      - Uncomment `isDevTarget` if we refactor to cmd/root.go and update to call `ResolveAPIHost`
 	// var isDevTarget = shared.NewClientFactory().AuthClient().UserDefaultAuthIsProd(ctx) // TODO - hack, remove shared.clients
-	var jaegerCloser, tracer = tracer.SetupTracer(false) // Always setup open tracing on prod
-	defer jaegerCloser.Close()
+	var jaegerCloser, tracer = tracer.SetupTracer(false, config.IsTelemetryDisabled(slackdeps.NewOs()))
+	defer func() {
+		done := make(chan struct{})
+		go func() {
+			jaegerCloser.Close()
+			close(done)
+		}()
+		select {
+		case <-done:
+		case <-time.After(2 * time.Second):
+		}
+	}()
 	ctx = slackcontext.SetOpenTracingTracer(ctx, tracer)
 
 	// Set context values