Skip to content
Open
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
5 changes: 4 additions & 1 deletion internal/connector/handoff.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,11 @@ func handOffReady(ctx context.Context, opts HandoffOptions) error {
// started is closed without being written.
func handOff(ctx context.Context, opts HandoffOptions, record Record) error {
if record.CreatedAt.Before(opts.Started.Add(-HandoffGrace)) {
if err := opts.Ledger.SetState(ctx, record.ID, StateDiscarded, ReasonBeforeThisRun); err != nil {
return err
}
opts.log().Info("connector: a request from before this run started is not handed off", "event_id", record.ID, "created_at", record.CreatedAt)
return opts.Ledger.SetState(ctx, record.ID, StateDiscarded, ReasonBeforeThisRun)
return nil
}
goes, err := opts.Ledger.isGo(ctx, record.ID)
if err != nil {
Expand Down
32 changes: 32 additions & 0 deletions internal/connector/handoff_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"context"
"encoding/json"
"log/slog"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -93,6 +94,37 @@ func TestARequestFromBeforeTheRunIsNotHandedOff(t *testing.T) {
assert.Equal(t, ReasonBeforeThisRun, r.Reason)
}

func TestAnOldRequestIsLoggedOnlyAfterDiscardSucceeds(t *testing.T) {
for _, failSave := range []bool{false, true} {
name := "saved"
if failSave {
name = "save_failed"
}
t.Run(name, func(t *testing.T) {
ledger := newTestLedger(t)
admitOn(t, ledger, 1, "recording:1")
record := getRecord(t, ledger, 1)
var out, logs bytes.Buffer
opts := handoffOptions(ledger, &out)
opts.Started = opts.Started.Add(time.Hour)
opts.Logger = slog.New(slog.NewTextHandler(&logs, nil))
if failSave {
require.NoError(t, ledger.Close())
}
err := handOff(t.Context(), opts, record)
if failSave {
require.Error(t, err)
assert.NotContains(t, logs.String(), "is not handed off")
} else {
require.NoError(t, err)
assert.Contains(t, logs.String(), "is not handed off")
assert.Equal(t, ReasonBeforeThisRun, getRecord(t, ledger, 1).Reason)
}
assert.Empty(t, out.String())
})
}
}

// Only the projects the agent serves, narrowed to the run's --project.
func TestOnlyServedProjectsAreHandedOff(t *testing.T) {
ledger := newTestLedger(t)
Expand Down
Loading