Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions cli/internal/adapters/linear/renderer.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func (r *Renderer) OnTaskLog(spanID string, data []byte) {
}

// OnTaskComplete flushes remaining buffer and prints completion status.
func (r *Renderer) OnTaskComplete(spanID string, endTime time.Time, err error) {
func (r *Renderer) OnTaskComplete(spanID string, endTime time.Time, err error, cached bool) {
r.mu.Lock()
defer r.mu.Unlock()

Expand All @@ -180,16 +180,22 @@ func (r *Renderer) OnTaskComplete(spanID string, endTime time.Time, err error) {

// Print completion message
duration := endTime.Sub(task.startTime)
durationStr := formatDuration(duration)
coloredPrefix := r.output.String(fmt.Sprintf("[%s]", task.name)).Foreground(task.color).String()

if err != nil {
switch {
case err != nil:
symbol := r.output.String("✗").Foreground(termenv.ANSIRed).String()
_, _ = fmt.Fprintf(r.stderr, "%s %s Failed after %v: %v\n",
coloredPrefix, symbol, duration, err)
} else {
_, _ = fmt.Fprintf(r.stderr, "%s %s Failed after %s: %v\n",
coloredPrefix, symbol, durationStr, err)
case cached:
symbol := r.output.String("⚡").Foreground(termenv.ANSIYellow).String()
_, _ = fmt.Fprintf(r.stderr, "%s %s Cached (skipped in %s)\n",
coloredPrefix, symbol, durationStr)
default:
symbol := r.output.String("✓").Foreground(termenv.ANSIGreen).String()
_, _ = fmt.Fprintf(r.stderr, "%s %s Completed in %v\n",
coloredPrefix, symbol, duration)
_, _ = fmt.Fprintf(r.stderr, "%s %s Completed in %s\n",
coloredPrefix, symbol, durationStr)
}

// Cleanup
Expand Down Expand Up @@ -227,3 +233,15 @@ func (r *Renderer) printLineLocked(taskName string, color termenv.Color, line []
prefix := r.output.String(fmt.Sprintf("[%s]", taskName)).Foreground(color).String()
_, _ = fmt.Fprintf(r.stdout, "%s %s\n", prefix, string(line))
}

// formatDuration formats a duration with appropriate units and 2 decimal precision.
func formatDuration(d time.Duration) string {
switch {
case d < time.Millisecond:
return fmt.Sprintf("%.2fµs", float64(d)/float64(time.Microsecond))
case d < time.Second:
return fmt.Sprintf("%.2fms", float64(d)/float64(time.Millisecond))
default:
return fmt.Sprintf("%.2fs", d.Seconds())
}
}
63 changes: 55 additions & 8 deletions cli/internal/adapters/linear/renderer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func TestRenderer_TaskLifecycle(t *testing.T) {

// Task complete
endTime := startTime.Add(100 * time.Millisecond)
r.OnTaskComplete("span1", endTime, nil)
r.OnTaskComplete("span1", endTime, nil, false)

if !strings.Contains(stderr.String(), "Completed") {
t.Errorf("Expected completion message, got: %s", stderr.String())
Expand Down Expand Up @@ -86,7 +86,7 @@ func TestRenderer_PartialLines(t *testing.T) {
// Flush on complete
r.OnTaskLog("span1", []byte("unflushed"))
endTime := startTime.Add(50 * time.Millisecond)
r.OnTaskComplete("span1", endTime, nil)
r.OnTaskComplete("span1", endTime, nil, false)

if !strings.Contains(stdout.String(), "task1") || !strings.Contains(stdout.String(), "unflushed") {
t.Errorf("Expected flushed partial line on complete, got: %s", stdout.String())
Expand All @@ -104,7 +104,7 @@ func TestRenderer_TaskError(t *testing.T) {

endTime := startTime.Add(50 * time.Millisecond)
err := zerr.New("task failed")
r.OnTaskComplete("span1", endTime, err)
r.OnTaskComplete("span1", endTime, err, false)

stderrStr := stderr.String()
if !strings.Contains(stderrStr, "Failed") {
Expand All @@ -115,6 +115,27 @@ func TestRenderer_TaskError(t *testing.T) {
}
}

func TestRenderer_TaskCached(t *testing.T) {
var stdout, stderr bytes.Buffer
r := linear.NewRenderer(&stdout, &stderr)

startTime := time.Now()
r.OnTaskStart("span1", "", "cached-task", startTime)

r.OnTaskLog("span1", []byte("cache check\n"))

endTime := startTime.Add(10 * time.Millisecond)
r.OnTaskComplete("span1", endTime, nil, true)

stderrStr := stderr.String()
if !strings.Contains(stderrStr, "Cached") {
t.Errorf("Expected cached message, got: %s", stderrStr)
}
if !strings.Contains(stderrStr, "skipped") {
t.Errorf("Expected 'skipped' in cached message, got: %s", stderrStr)
}
}

func TestRenderer_ConcurrentTasks(t *testing.T) {
var stdout, stderr bytes.Buffer
r := linear.NewRenderer(&stdout, &stderr)
Expand Down Expand Up @@ -153,8 +174,8 @@ func TestRenderer_ConcurrentTasks(t *testing.T) {
}

endTime := startTime.Add(100 * time.Millisecond)
r.OnTaskComplete("span1", endTime, nil)
r.OnTaskComplete("span2", endTime, nil)
r.OnTaskComplete("span1", endTime, nil, false)
r.OnTaskComplete("span2", endTime, nil, false)
}

func TestRenderer_NoColor(t *testing.T) {
Expand All @@ -172,7 +193,7 @@ func TestRenderer_NoColor(t *testing.T) {
r.OnTaskStart("span1", "", "task1", startTime)

endTime := startTime.Add(50 * time.Millisecond)
r.OnTaskComplete("span1", endTime, nil)
r.OnTaskComplete("span1", endTime, nil, false)

// With NO_COLOR, output should not contain ANSI escape codes
stderrStr := stderr.String()
Expand Down Expand Up @@ -242,7 +263,7 @@ func TestRenderer_OnTaskCompleteUnknownSpan(t *testing.T) {
var stdout, stderr bytes.Buffer
r := linear.NewRenderer(&stdout, &stderr)

r.OnTaskComplete("unknown-span", time.Now(), nil)
r.OnTaskComplete("unknown-span", time.Now(), nil, false)

if stderr.Len() != 0 {
t.Errorf("Expected no output for unknown span completion, got: %s", stderr.String())
Expand Down Expand Up @@ -288,6 +309,32 @@ func TestRenderer_StopFlushesBuffers(t *testing.T) {
}
}

func TestRenderer_StopWithCompletedTask(t *testing.T) {
var stdout, stderr bytes.Buffer
r := linear.NewRenderer(&stdout, &stderr)

startTime := time.Now()
r.OnTaskStart("span1", "", "task1", startTime)
r.OnTaskStart("span2", "", "task2", startTime)

r.OnTaskLog("span1", []byte("partial1"))
r.OnTaskLog("span2", []byte("partial2"))

// Complete span1, leaving span2 with buffer
endTime := startTime.Add(50 * time.Millisecond)
r.OnTaskComplete("span1", endTime, nil, false)

// Stop should flush span2's buffer and handle span1's missing task gracefully
if err := r.Stop(); err != nil {
t.Fatalf("Stop() error = %v", err)
}

stdoutStr := stdout.String()
if !strings.Contains(stdoutStr, "partial2") {
t.Errorf("Expected flushed partial2, got: %s", stdoutStr)
}
}

func TestRenderer_Wait(t *testing.T) {
var stdout, stderr bytes.Buffer
r := linear.NewRenderer(&stdout, &stderr)
Expand All @@ -303,5 +350,5 @@ func TestRenderer_NilStdout(_ *testing.T) {
startTime := time.Now()
r.OnTaskStart("span1", "", "task1", startTime)
r.OnTaskLog("span1", []byte("test\n"))
r.OnTaskComplete("span1", startTime.Add(time.Second), nil)
r.OnTaskComplete("span1", startTime.Add(time.Second), nil, false)
}
10 changes: 10 additions & 0 deletions cli/internal/adapters/telemetry/bridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"

"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"go.opentelemetry.io/otel/trace"
Expand Down Expand Up @@ -66,10 +67,19 @@ func (b *Bridge) OnEnd(s sdktrace.ReadOnlySpan) {
err = errors.New(desc)
}

cached := false
for _, attr := range s.Attributes() {
if string(attr.Key) == "same.cached" && attr.Value.Type() == attribute.BOOL {
cached = attr.Value.AsBool()
break
}
}

b.renderer.OnTaskComplete(
sc.SpanID().String(),
s.EndTime(),
err,
cached,
)
}

Expand Down
30 changes: 28 additions & 2 deletions cli/internal/adapters/telemetry/bridge_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"testing"

"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"go.trai.ch/same/internal/adapters/telemetry"
Expand Down Expand Up @@ -50,7 +51,7 @@ func TestBridge_OnEnd(t *testing.T) {
mockRenderer := mocks.NewMockRenderer(ctrl)
bridge := telemetry.NewBridge(mockRenderer)

mockRenderer.EXPECT().OnTaskComplete(gomock.Any(), gomock.Any(), nil).Times(1)
mockRenderer.EXPECT().OnTaskComplete(gomock.Any(), gomock.Any(), nil, false).Times(1)

tp := sdktrace.NewTracerProvider()
tracer := tp.Tracer("test")
Expand All @@ -69,7 +70,7 @@ func TestBridge_OnEndWithError(t *testing.T) {
mockRenderer := mocks.NewMockRenderer(ctrl)
bridge := telemetry.NewBridge(mockRenderer)

mockRenderer.EXPECT().OnTaskComplete(gomock.Any(), gomock.Any(), gomock.Any()).Times(1)
mockRenderer.EXPECT().OnTaskComplete(gomock.Any(), gomock.Any(), gomock.Any(), false).Times(1)

tp := sdktrace.NewTracerProvider()
tracer := tp.Tracer("test")
Expand Down Expand Up @@ -118,3 +119,28 @@ func TestBridge_Shutdown(t *testing.T) {
t.Errorf("Shutdown() should not return error, got: %v", err)
}
}

func TestBridge_OnEndWithCachedAttribute(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

mockRenderer := mocks.NewMockRenderer(ctrl)
bridge := telemetry.NewBridge(mockRenderer)

mockRenderer.EXPECT().OnTaskComplete(
gomock.Any(),
gomock.Any(),
nil,
true,
).Times(1)

tp := sdktrace.NewTracerProvider()
tracer := tp.Tracer("test")
_, span := tracer.Start(context.Background(), "test-span")
span.SetAttributes(attribute.Bool("same.cached", true))
span.End()

if roSpan, ok := span.(sdktrace.ReadOnlySpan); ok {
bridge.OnEnd(roSpan)
}
}
1 change: 1 addition & 0 deletions cli/internal/adapters/telemetry/messages.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ type MsgTaskComplete struct {
SpanID string
EndTime time.Time
Err error
Cached bool
}

// MsgTaskLog carries a chunk of log output for a specific task.
Expand Down
2 changes: 1 addition & 1 deletion cli/internal/adapters/telemetry/mock_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (m *mockRenderer) OnTaskLog(_ string, data []byte) {
m.logs = append(m.logs, data)
}

func (m *mockRenderer) OnTaskComplete(_ string, _ time.Time, _ error) {
func (m *mockRenderer) OnTaskComplete(_ string, _ time.Time, _ error, _ bool) {
m.mu.Lock()
defer m.mu.Unlock()
m.completeCalls++
Expand Down
1 change: 1 addition & 0 deletions cli/internal/adapters/tui/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case telemetry.MsgTaskComplete:
if node, ok := m.SpanMap[msg.SpanID]; ok {
node.EndTime = msg.EndTime
node.Cached = msg.Cached
if msg.Err != nil {
node.Status = StatusError
} else {
Expand Down
25 changes: 23 additions & 2 deletions cli/internal/adapters/tui/model_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,14 @@ func TestModel_Update_Telemetry(t *testing.T) {
assert.Contains(t, output, "hello log")

// 4. Complete Task (Success)
msgComplete := telemetry.MsgTaskComplete{SpanID: spanID, Err: nil}
msgComplete := telemetry.MsgTaskComplete{SpanID: spanID, Err: nil, Cached: false}
m.Update(msgComplete)
assert.Equal(t, tui.StatusDone, m.TaskMap["task1"].Status)

// 5. Complete Task (Error)
// Reset status for test
m.TaskMap["task1"].Status = tui.StatusRunning
msgError := telemetry.MsgTaskComplete{SpanID: spanID, Err: assert.AnError}
msgError := telemetry.MsgTaskComplete{SpanID: spanID, Err: assert.AnError, Cached: false}
m.Update(msgError)
assert.Equal(t, tui.StatusError, m.TaskMap["task1"].Status)
}
Expand Down Expand Up @@ -372,6 +372,27 @@ func TestModel_Update_TaskExecStart(t *testing.T) {
assert.False(t, task.ExecStartTime.IsZero())
}

func TestModel_Update_TaskCompleteCached(t *testing.T) {
t.Parallel()

task := &tui.TaskNode{Name: "task1", Term: tui.NewVterm()}
m := &tui.Model{
TaskMap: map[string]*tui.TaskNode{"task1": task},
SpanMap: map[string]*tui.TaskNode{"span-cached": task},
}

msgComplete := telemetry.MsgTaskComplete{
SpanID: "span-cached",
EndTime: time.Now(),
Err: nil,
Cached: true,
}
m.Update(msgComplete)

assert.Equal(t, tui.StatusDone, task.Status)
assert.True(t, task.Cached, "Cached flag should be set to true")
}

func TestModel_getSelectedTask_OutOfBounds(t *testing.T) {
t.Parallel()

Expand Down
3 changes: 2 additions & 1 deletion cli/internal/adapters/tui/renderer.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ func (r *Renderer) OnTaskLog(spanID string, data []byte) {
}

// OnTaskComplete forwards task completion events to the TUI.
func (r *Renderer) OnTaskComplete(spanID string, endTime time.Time, err error) {
func (r *Renderer) OnTaskComplete(spanID string, endTime time.Time, err error, cached bool) {
r.program.Send(telemetry.MsgTaskComplete{
SpanID: spanID,
EndTime: endTime,
Err: err,
Cached: cached,
})
}

Expand Down
4 changes: 2 additions & 2 deletions cli/internal/adapters/tui/renderer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func TestRenderer_OnTaskComplete(t *testing.T) {
startTime := time.Now()
renderer.OnTaskStart("span1", "", "task1", startTime)
endTime := startTime.Add(100 * time.Millisecond)
renderer.OnTaskComplete("span1", endTime, nil)
renderer.OnTaskComplete("span1", endTime, nil, false)

time.Sleep(10 * time.Millisecond)
}
Expand All @@ -166,7 +166,7 @@ func TestRenderer_OnTaskCompleteWithError(t *testing.T) {
startTime := time.Now()
renderer.OnTaskStart("span1", "", "task1", startTime)
endTime := startTime.Add(100 * time.Millisecond)
renderer.OnTaskComplete("span1", endTime, zerr.New("task failed"))
renderer.OnTaskComplete("span1", endTime, zerr.New("task failed"), false)

time.Sleep(10 * time.Millisecond)
}
Expand Down
3 changes: 2 additions & 1 deletion cli/internal/core/ports/renderer.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@ type Renderer interface {
// spanID: identifier for the task
// endTime: when the task completed
// err: nil if successful, error otherwise
OnTaskComplete(spanID string, endTime time.Time, err error)
// cached: true if the task was retrieved from cache
OnTaskComplete(spanID string, endTime time.Time, err error, cached bool)
}