add to traces (#1590)

Co-authored-by: Rebecca Mahany-Horton <[email protected]>

ee/tables/tablehelpers/exec.go

@@ -5,12 +5,14 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"path/filepath"
 	"time"
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	"github.com/kolide/launcher/ee/allowedcmd"
 	"github.com/kolide/launcher/pkg/traces"
+	"go.opentelemetry.io/otel/attribute"
 )
 
 // Exec is a wrapper over exec.CommandContext. It does a couple of
@@ -40,6 +42,10 @@ func Exec(ctx context.Context, logger log.Logger, timeoutSeconds int, execCmd al
 		return nil, fmt.Errorf("creating command: %w", err)
 	}
 
+	span.SetAttributes(attribute.String("exec.path", cmd.Path))
+	span.SetAttributes(attribute.String("exec.binary", filepath.Base(cmd.Path)))
+	span.SetAttributes(attribute.StringSlice("exec.args", args))
+
 	cmd.Stdout = &stdout
 	if includeStderr {
 		cmd.Stderr = &stdout
@@ -57,6 +63,10 @@ func Exec(ctx context.Context, logger log.Logger, timeoutSeconds int, execCmd al
 		return stdout.Bytes(), nil
 	case os.IsNotExist(err):
 		return nil, fmt.Errorf("could not find %s to run: %w", cmd.Path, err)
+	case ctx.Err() != nil:
+		// ctx.Err() should only be set if the context is canceled or done
+		traces.SetError(span, ctx.Err())
+		return nil, fmt.Errorf("context canceled during exec '%s'. Got: '%s': %w", cmd.String(), stderr.String(), ctx.Err())
 	default:
 		traces.SetError(span, err)
 		return nil, fmt.Errorf("exec '%s'. Got: '%s': %w", cmd.String(), stderr.String(), err)

pkg/traces/traces.go

@@ -77,8 +77,12 @@ func startSpanWithExtractedAttributes(ctx context.Context, keyVals ...interface{
 
 // SetError records the error on the span and sets the span's status to error.
 func SetError(span trace.Span, err error) {
+	// These are some otel ways to record errors. But we're not sure where they come through in GCP traces
 	span.RecordError(err)
 	span.SetStatus(codes.Error, err.Error())
+
+	// Dump the error into a span attribute, because :shrug:
+	span.SetAttributes(semconv.ExceptionMessage(err.Error()))
 }
 
 // buildAttributes takes the given keyVals, expected to be pairs representing the key