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: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
cache: pnpm
- uses: flanksource/deps@v1.0.49
with:
GITHUB_TOKEN: ${{ github.token }}
tools: |
task
- run: make setup
Expand Down Expand Up @@ -155,6 +156,7 @@ jobs:
cache: pnpm
- uses: flanksource/deps@v1.0.49
with:
GITHUB_TOKEN: ${{ github.token }}
tools: |
task
rhysd/actionlint
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
cache: pnpm
- uses: flanksource/deps@v1.0.49
with:
GITHUB_TOKEN: ${{ github.token }}
tools: |
task
- name: Select or reuse release version
Expand Down
6 changes: 5 additions & 1 deletion sdk/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"runtime"
"strconv"
"sync"
"syscall"
"time"

"github.com/flanksource/telltale/sdk/protocol"
Expand Down Expand Up @@ -208,7 +209,10 @@ func (a *Agent) accept() {
if closed {
return
}
if temporary, ok := err.(net.Error); ok && temporary.Temporary() {
if os.IsTimeout(err) || errors.Is(err, syscall.EINTR) || errors.Is(err, syscall.EAGAIN) ||
errors.Is(err, syscall.EMFILE) || errors.Is(err, syscall.ENFILE) ||
errors.Is(err, syscall.ENOBUFS) || errors.Is(err, syscall.ENOMEM) ||
errors.Is(err, syscall.ECONNABORTED) || errors.Is(err, syscall.ECONNRESET) {
if delay == 0 {
delay = 5 * time.Millisecond
} else {
Expand Down
70 changes: 38 additions & 32 deletions sdk/agent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,48 +10,54 @@ import (
"path/filepath"
"strconv"
"sync/atomic"
"syscall"
"time"

"github.com/flanksource/telltale/sdk/protocol"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)

type temporaryAcceptError struct{}

func (temporaryAcceptError) Error() string { return "temporary accept" }
func (temporaryAcceptError) Timeout() bool { return false }
func (temporaryAcceptError) Temporary() bool { return true }

type temporaryListener struct {
net.Listener
failed atomic.Bool
err error
}

func (l *temporaryListener) Accept() (net.Conn, error) {
if l.failed.CompareAndSwap(false, true) {
return nil, temporaryAcceptError{}
return nil, &net.OpError{Op: "accept", Net: "tcp", Err: l.err}
}
return l.Listener.Accept()
}

var _ = Describe("loopback agent", func() {
It("retries a temporary listener failure", func() {
DescribeTable("retries a transient listener failure", func(acceptErr error) {
listener, err := net.Listen("tcp", "127.0.0.1:0")
Expect(err).NotTo(HaveOccurred())
wrapped := &temporaryListener{Listener: listener}
wrapped := &temporaryListener{Listener: listener, err: acceptErr}
agent := newAgent(Options{})
agent.listener = wrapped
go agent.accept()
defer agent.Close()
defer func() { Expect(agent.Close()).To(Succeed()) }()
stream, err := net.Dial("tcp", listener.Addr().String())
Expect(err).NotTo(HaveOccurred())
defer stream.Close()
defer func() { Expect(stream.Close()).To(Succeed()) }()
Expect(stream.SetDeadline(time.Now().Add(time.Second))).To(Succeed())
_, _, err = protocol.Authenticate(stream, "")
Expect(err).NotTo(HaveOccurred())
Expect(wrapped.failed.Load()).To(BeTrue())
})
},
Entry("process file limit", syscall.EMFILE),
Entry("system file limit", syscall.ENFILE),
Entry("interrupted call", syscall.EINTR),
Entry("unavailable resource", syscall.EAGAIN),
Entry("exhausted socket buffers", syscall.ENOBUFS),
Entry("exhausted memory", syscall.ENOMEM),
Entry("aborted connection", syscall.ECONNABORTED),
Entry("reset connection", syscall.ECONNRESET),
Entry("timeout", os.ErrDeadlineExceeded),
)
It("removes its discovery file when its listener fails permanently", func() {
GinkgoT().Setenv("HOME", GinkgoT().TempDir())
a, err := Start(Options{Listen: "tcp"})
Expand All @@ -78,19 +84,19 @@ var _ = Describe("loopback agent", func() {
It("closes an idle pre-authentication connection", func() {
agent := newAgent(Options{})
agent.authTimeout = 50 * time.Millisecond
defer agent.Close()
defer func() { Expect(agent.Close()).To(Succeed()) }()
stream := agent.Connect()
defer stream.Close()
defer func() { Expect(stream.Close()).To(Succeed()) }()
Expect(stream.SetReadDeadline(time.Now().Add(time.Second))).To(Succeed())
_, _, err := protocol.NewConn(stream).Read()
Expect(err).To(HaveOccurred())
Expect(errors.Is(err, os.ErrDeadlineExceeded)).To(BeFalse())
})
It("closes a connection that declares an oversized pre-authentication frame", func() {
a := Loopback()
defer a.Close()
defer func() { Expect(a.Close()).To(Succeed()) }()
stream := a.Connect()
defer stream.Close()
defer func() { Expect(stream.Close()).To(Succeed()) }()
Expect(stream.SetDeadline(time.Now().Add(time.Second))).To(Succeed())
Expect(binary.Write(stream, binary.BigEndian, uint32(4097))).To(Succeed())
_, _, err := protocol.NewConn(stream).Read()
Expand All @@ -112,9 +118,9 @@ var _ = Describe("loopback agent", func() {
})
It("advertises and arms only probes allowed by options", func() {
agent := newAgent(Options{Probes: []string{"stacks"}})
defer agent.Close()
defer func() { Expect(agent.Close()).To(Succeed()) }()
stream := agent.Connect()
defer stream.Close()
defer func() { Expect(stream.Close()).To(Succeed()) }()
conn, hello, err := protocol.Authenticate(stream, "")
Expect(err).NotTo(HaveOccurred())
Expect(hello.Probes).To(HaveLen(1))
Expand All @@ -128,9 +134,9 @@ var _ = Describe("loopback agent", func() {
})
It("does not reveal hello before authentication", func() {
agent := newAgent(Options{Token: "secret"})
defer agent.Close()
defer func() { Expect(agent.Close()).To(Succeed()) }()
stream := agent.Connect()
defer stream.Close()
defer func() { Expect(stream.Close()).To(Succeed()) }()
Expect(stream.SetReadDeadline(time.Now().Add(50 * time.Millisecond))).To(Succeed())
_, _, err := protocol.NewConn(stream).Read()
Expect(err).To(HaveOccurred())
Expand All @@ -157,18 +163,18 @@ var _ = Describe("loopback agent", func() {
})
It("rejects an invalid authentication token with a named error", func() {
agent := newAgent(Options{Token: "correct"})
defer agent.Close()
defer func() { Expect(agent.Close()).To(Succeed()) }()
stream := agent.Connect()
defer stream.Close()
defer func() { Expect(stream.Close()).To(Succeed()) }()
Expect(stream.SetDeadline(time.Now().Add(5 * time.Second))).To(Succeed())
_, _, err := protocol.Authenticate(stream, "wrong")
Expect(errors.Is(err, protocol.ErrAuthRejected)).To(BeTrue())
})
It("connects using the shared protocol client", func() {
agent := Loopback()
defer agent.Close()
defer func() { Expect(agent.Close()).To(Succeed()) }()
stream := agent.Connect()
defer stream.Close()
defer func() { Expect(stream.Close()).To(Succeed()) }()
Expect(stream.SetDeadline(time.Now().Add(5 * time.Second))).To(Succeed())
conn, hello, err := protocol.Authenticate(stream, "")
Expect(err).NotTo(HaveOccurred())
Expand All @@ -180,9 +186,9 @@ var _ = Describe("loopback agent", func() {
})
It("ends a session when its record limit is reached", func() {
agent := Loopback()
defer agent.Close()
defer func() { Expect(agent.Close()).To(Succeed()) }()
stream := agent.Connect()
defer stream.Close()
defer func() { Expect(stream.Close()).To(Succeed()) }()
Expect(stream.SetDeadline(time.Now().Add(5 * time.Second))).To(Succeed())
conn, _, err := protocol.Authenticate(stream, "")
Expect(err).NotTo(HaveOccurred())
Expand All @@ -207,9 +213,9 @@ var _ = Describe("loopback agent", func() {
})
It("drops excess records without ending a rate-limited session", func() {
agent := Loopback()
defer agent.Close()
defer func() { Expect(agent.Close()).To(Succeed()) }()
stream := agent.Connect()
defer stream.Close()
defer func() { Expect(stream.Close()).To(Succeed()) }()
Expect(stream.SetDeadline(time.Now().Add(5 * time.Second))).To(Succeed())
conn, _, err := protocol.Authenticate(stream, "")
Expect(err).NotTo(HaveOccurred())
Expand All @@ -229,9 +235,9 @@ var _ = Describe("loopback agent", func() {
})
It("ends a session when a checkpoint fails", func() {
agent := Loopback()
defer agent.Close()
defer func() { Expect(agent.Close()).To(Succeed()) }()
stream := agent.Connect()
defer stream.Close()
defer func() { Expect(stream.Close()).To(Succeed()) }()
Expect(stream.SetDeadline(time.Now().Add(5 * time.Second))).To(Succeed())
conn, _, err := protocol.Authenticate(stream, "")
Expect(err).NotTo(HaveOccurred())
Expand All @@ -253,9 +259,9 @@ var _ = Describe("loopback agent", func() {
})
It("authenticates, arms a stacks probe, and returns a checkpoint blob", func() {
agent := Loopback()
defer agent.Close()
defer func() { Expect(agent.Close()).To(Succeed()) }()
stream := agent.Connect()
defer stream.Close()
defer func() { Expect(stream.Close()).To(Succeed()) }()
Expect(stream.SetDeadline(time.Now().Add(5 * time.Second))).To(Succeed())
conn, _, err := protocol.Authenticate(stream, "")
Expect(err).NotTo(HaveOccurred())
Expand Down
4 changes: 2 additions & 2 deletions sdk/checkpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func (s *checkpointSink) TryEmit(value any) bool {
return false
}
if len(s.records) >= 256 || s.bytes+len(data)+1 > maxBatchBytes-1024 {
s.session.dropped.Add(1)
s.dropped.Add(1)
return false
}
s.records = append(s.records, data)
Expand All @@ -38,7 +38,7 @@ func (s *checkpointSink) TryEmit(value any) bool {
func (s *checkpointSink) Blob(name, contentType string, data []byte, meta any) error {
metadata, err := json.Marshal(meta)
if err == nil {
err = send(s.conn, protocol.TypeBlob, protocol.Blob{Session: s.session.id, Checkpoint: s.id, Seq: s.session.blobSeq.Add(1), Name: name, ContentType: contentType, Len: len(data), Meta: metadata}, data)
err = send(s.conn, protocol.TypeBlob, protocol.Blob{Session: s.session.id, Checkpoint: s.id, Seq: s.blobSeq.Add(1), Name: name, ContentType: contentType, Len: len(data), Meta: metadata}, data)
}
s.mu.Lock()
s.err = errors.Join(s.err, err)
Expand Down
6 changes: 3 additions & 3 deletions sdk/clicky/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ require (
github.com/tklauser/numcpus v0.11.0 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/otel v1.45.0 // indirect
go.opentelemetry.io/otel/trace v1.45.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
go.opentelemetry.io/otel v1.47.0 // indirect
go.opentelemetry.io/otel/trace v1.47.0 // indirect
go.yaml.in/yaml/v3 v3.0.5 // indirect
golang.org/x/mod v0.41.0 // indirect
golang.org/x/net v0.62.0 // indirect
golang.org/x/sync v0.24.0 // indirect
Expand Down
23 changes: 12 additions & 11 deletions sdk/clicky/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6N
github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
Expand Down Expand Up @@ -232,8 +230,8 @@ github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/match v1.2.0 h1:0pt8FlkOwjN2fPt4bIl4BoNxb98gGHN2ObFEDkrfZnM=
Expand Down Expand Up @@ -266,20 +264,23 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU=
go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ=
go.opentelemetry.io/otel v1.47.0 h1:j7ALJ/zgkS7Z6aeJW09p8VC9804bC+PpeTfCD4XPnOM=
go.opentelemetry.io/otel v1.47.0/go.mod h1:8wS9O2qfXrYrzp6hIF/HOYJJf/wIhFPhR2xLuP+iXQU=
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.44.0 h1:bl2S7Ubua0Nms+D/gAmznQTd4dxxMA93aKbcpKqiTCs=
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.44.0/go.mod h1:L0hRV50XdVIODHUfWEqGRCXQvj2rV82STVo12FMFBU0=
go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M=
go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s=
go.opentelemetry.io/otel/log v1.47.0 h1:cOTS1CcLbSQeZKanGJ+0JpF/+t4PELi3O3bbl2lqCcI=
go.opentelemetry.io/otel/log v1.47.0/go.mod h1:9byitSQ5pLC6PpqwGXjqdMKya6ZTswHRZh2vvXT33nw=
go.opentelemetry.io/otel/metric v1.47.0 h1:4PptaldXx3Eat1XjMZ68pPJEs5wrhlemctZE9a3UdWY=
go.opentelemetry.io/otel/metric v1.47.0/go.mod h1:ADGSXxRrXM6bjbvLo535EstVFlPpPYZm4LBKixjDHwU=
go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=
go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag=
go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc=
go.opentelemetry.io/otel/trace v1.47.0 h1:JOjX/Oci8K94QHddo+bbfya/Ai/nf6/dt9ZfrFNWSrM=
go.opentelemetry.io/otel/trace v1.47.0/go.mod h1:jNaSLa2PZEYFG6fRjJABAu+bw4FS08uDmPg28lTghu0=
go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ=
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
golang.org/x/exp v0.0.0-20260527015227-08cc5374adb3 h1:VHEvKbpgPXcPXn40t9cDTGK3JZwMikIEyF/CTrFfu7k=
golang.org/x/exp v0.0.0-20260527015227-08cc5374adb3/go.mod h1:d2fgXJLVs4dYDHUk5lwMIfzRzSrWCfGZb0ZqeLa/Vcw=
golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c=
Expand Down
Loading
Loading