Merge pull request #432 from overmindtech/tracing

Force authentication info into the root trace if available
overmindtech · Jun 21, 2024 · 6373b69 · 6373b69
2 parents 5a88b40 + 04e2c14
commit 6373b69
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/cmd/tea_ensuretoken.go b/cmd/tea_ensuretoken.go
@@ -20,7 +20,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/oauth2"
 )
 
@@ -486,12 +485,13 @@ func getOauthToken(ctx context.Context, oi OvermindInstance, requiredScopes []st
 		os.Exit(1)
 	}
 
-	span := trace.SpanFromContext(ctx)
-	span.SetAttributes(
-		attribute.Bool("ovm.cli.authenticated", true),
-		attribute.String("ovm.cli.accountName", customClaims.AccountName),
-		attribute.String("ovm.cli.userId", out.Subject),
-	)
+	if cmdSpan != nil {
+		cmdSpan.SetAttributes(
+			attribute.Bool("ovm.cli.authenticated", true),
+			attribute.String("ovm.cli.accountName", customClaims.AccountName),
+			attribute.String("ovm.cli.userId", out.Subject),
+		)
+	}
 
 	// Save the token locally
 	if home, err := os.UserHomeDir(); err == nil {

diff --git a/cmd/tea_terraform.go b/cmd/tea_terraform.go
@@ -236,12 +236,13 @@ func (m *cmdModel) tokenChecks(token *oauth2.Token) tea.Cmd {
 			return fatalError{err: fmt.Errorf("received unparsable token: %w", err)}
 		}
 
-		span := trace.SpanFromContext(m.ctx)
-		span.SetAttributes(
-			attribute.Bool("ovm.cli.authenticated", true),
-			attribute.String("ovm.cli.accountName", customClaims.AccountName),
-			attribute.String("ovm.cli.userId", out.Subject),
-		)
+		if cmdSpan != nil {
+			cmdSpan.SetAttributes(
+				attribute.Bool("ovm.cli.authenticated", true),
+				attribute.String("ovm.cli.accountName", customClaims.AccountName),
+				attribute.String("ovm.cli.userId", out.Subject),
+			)
+		}
 
 		return loadSourcesConfigMsg{
 			ctx:    m.ctx,