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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Run go vet
run: go vet ./...
- name: Install golangci-lint
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
run: go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.15.0
- name: Run golangci-lint
run: golangci-lint run
test:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build stage
FROM golang:1.26.6-alpine AS builder
FROM golang:1.27.3-alpine AS builder

# VERSION is stamped into the binary via -ldflags="-X main.Version=...".
# CI passes the release tag (or commit SHA) here so the value reported by
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/warpdotdev/oz-agent-worker

go 1.26.6
go 1.27.3

require (
github.com/alecthomas/kong v1.13.0
Expand Down
4 changes: 3 additions & 1 deletion internal/tasktelemetry/tracing/session_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,9 @@ func TestTaskTraceBoundedShutdown(t *testing.T) {
if time.Since(begin) > time.Second {
t.Fatal("queue overflow blocked task instrumentation")
}
<-flushed
if err := <-flushed; err == nil {
t.Fatal("blocked trace flush succeeded")
}
session.End("interrupted", nil)
shutdownCtx, stop := context.WithTimeout(t.Context(), 100*time.Millisecond)
begin = time.Now()
Expand Down
2 changes: 1 addition & 1 deletion internal/worker/docker_logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func (b *DockerBackend) followContainerLogs(ctx context.Context, containerID str
stderr := reporter.Writer(ctx, "container.stderr", append(attrs, attribute.String("log.iostream", "stderr"))...)
defer stdout.Flush()
defer stderr.Flush()
if err := copyDockerLogFrames(stream, stdout, stderr); err != nil && !errors.Is(err, io.EOF) && streamCtx.Err() == nil {
if err := copyDockerLogFrames(stream, stdout, stderr); !errors.Is(err, io.EOF) && streamCtx.Err() == nil {
log.Warnf(ctx, "Docker task log stream interrupted")
}
}()
Expand Down
4 changes: 3 additions & 1 deletion internal/worker/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,9 @@ func (w *Worker) gracefullyCloseConnection(
log.Warnf(w.ctx, "Failed to send close message: %v", err)
}
connectionCancel()
<-groupDone
if err := <-groupDone; err != nil {
log.Warnf(w.ctx, "Connection closed: %v", err)
}
}

func (w *Worker) readLoop(ctx context.Context, conn *websocket.Conn) error {
Expand Down
Loading