diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f9bec0..a65d66c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,7 @@ jobs: cache: pnpm - uses: flanksource/deps@v1.0.49 with: + GITHUB_TOKEN: ${{ github.token }} tools: | task - run: make setup @@ -155,6 +156,7 @@ jobs: cache: pnpm - uses: flanksource/deps@v1.0.49 with: + GITHUB_TOKEN: ${{ github.token }} tools: | task rhysd/actionlint diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a2d3cdb..9a2b7ed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/sdk/agent.go b/sdk/agent.go index 0881ba8..9fb03a1 100644 --- a/sdk/agent.go +++ b/sdk/agent.go @@ -14,6 +14,7 @@ import ( "runtime" "strconv" "sync" + "syscall" "time" "github.com/flanksource/telltale/sdk/protocol" @@ -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 { diff --git a/sdk/agent_test.go b/sdk/agent_test.go index c6505f1..3094bdf 100644 --- a/sdk/agent_test.go +++ b/sdk/agent_test.go @@ -10,6 +10,7 @@ import ( "path/filepath" "strconv" "sync/atomic" + "syscall" "time" "github.com/flanksource/telltale/sdk/protocol" @@ -17,41 +18,46 @@ import ( . "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"}) @@ -78,9 +84,9 @@ 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()) @@ -88,9 +94,9 @@ var _ = Describe("loopback agent", func() { }) 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() @@ -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)) @@ -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()) @@ -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()) @@ -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()) @@ -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()) @@ -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()) @@ -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()) diff --git a/sdk/checkpoint.go b/sdk/checkpoint.go index de47daa..301ce43 100644 --- a/sdk/checkpoint.go +++ b/sdk/checkpoint.go @@ -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) @@ -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) diff --git a/sdk/clicky/go.mod b/sdk/clicky/go.mod index 68554af..f75adc8 100644 --- a/sdk/clicky/go.mod +++ b/sdk/clicky/go.mod @@ -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 diff --git a/sdk/clicky/go.sum b/sdk/clicky/go.sum index 5a953d0..2e6c8ff 100644 --- a/sdk/clicky/go.sum +++ b/sdk/clicky/go.sum @@ -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= @@ -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= @@ -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= diff --git a/sdk/dispatch_test.go b/sdk/dispatch_test.go index 2035e64..38e0e4e 100644 --- a/sdk/dispatch_test.go +++ b/sdk/dispatch_test.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "errors" + "github.com/flanksource/telltale/sdk/protocol" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -101,9 +102,9 @@ var _ = Describe("protocol dispatch", func() { It("tags checkpoint records before the terminal frame", func() { RegisterProbe(checkpointRecordProbe{}) a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "record-session", Probe: "checkpoint-record", Params: json.RawMessage(`{}`)})).To(Succeed()) _, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -122,9 +123,9 @@ var _ = Describe("protocol dispatch", func() { }) It("tags checkpoint blobs and terminates the matching checkpoint", func() { a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "stacks-checkpoint", Probe: "stacks", Params: json.RawMessage(`{}`)})).To(Succeed()) _, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -146,9 +147,9 @@ var _ = Describe("protocol dispatch", func() { It("executes an operation and returns its result", func() { RegisterOp(echoOp{}) a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("call", protocol.Call{CallID: "echo", Op: "echo-op", Params: json.RawMessage(`{"name":"example"}`)})).To(Succeed()) frame, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -161,9 +162,9 @@ var _ = Describe("protocol dispatch", func() { It("uses a probe's mutation hook for each set of parameters", func() { RegisterProbe(selectiveProbe{}) a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() for _, request := range []protocol.Arm{ {Session: "read", Probe: "selective-probe", Params: json.RawMessage(`{"mutate":false}`)}, {Session: "mutate", Probe: "selective-probe", Params: json.RawMessage(`{"mutate":true}`)}, @@ -187,9 +188,9 @@ var _ = Describe("protocol dispatch", func() { It("turns a checkpoint panic into an ended frame", func() { RegisterProbe(panicCheckpointProbe{}) a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "panic-checkpoint", Probe: "panic-checkpoint", Params: json.RawMessage(`{}`)})).To(Succeed()) _, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -204,9 +205,9 @@ var _ = Describe("protocol dispatch", func() { }) It("returns named errors for unknown messages and operations without disconnecting", func() { a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("unexpected", struct{}{})).To(Succeed()) frame, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -227,9 +228,9 @@ var _ = Describe("protocol dispatch", func() { It("turns an arm panic into a named ended frame", func() { RegisterProbe(panicProbe{}) a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "panic", Probe: "panic-probe", Params: json.RawMessage(`{}`)})).To(Succeed()) frame, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -242,9 +243,9 @@ var _ = Describe("protocol dispatch", func() { It("retains both the probe failure and the revert failure", func() { RegisterProbe(failingProbe{}) a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "failures", Probe: "failing-probe", Params: json.RawMessage(`{}`)})).To(Succeed()) _, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -263,9 +264,9 @@ var _ = Describe("protocol dispatch", func() { It("reports an unsupported checkpoint and keeps the connection usable", func() { RegisterProbe(noCheckpointProbe{}) a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "no-checkpoint", Probe: "no-checkpoint", Params: json.RawMessage(`{}`)})).To(Succeed()) _, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) diff --git a/sdk/go.mod b/sdk/go.mod index c71e623..718b8ee 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -24,7 +24,7 @@ require ( github.com/clipperhouse/uax29/v2 v2.7.0 // indirect github.com/dlclark/regexp2 v1.11.5 // indirect github.com/flanksource/clicky v1.21.82 // indirect - github.com/go-logr/logr v1.4.3 // indirect + github.com/go-logr/logr v1.4.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect @@ -39,10 +39,11 @@ require ( github.com/rivo/uniseg v0.4.7 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect - go.opentelemetry.io/otel v1.44.0 // indirect - go.opentelemetry.io/otel/metric v1.44.0 // indirect - go.opentelemetry.io/otel/trace v1.44.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect + go.opentelemetry.io/otel v1.47.0 // indirect + go.opentelemetry.io/otel/log v1.47.0 // indirect + go.opentelemetry.io/otel/metric 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.37.0 // indirect golang.org/x/net v0.56.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect diff --git a/sdk/go.sum b/sdk/go.sum index aae6b3a..7858ce8 100644 --- a/sdk/go.sum +++ b/sdk/go.sum @@ -32,8 +32,6 @@ github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSE github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0= github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk= github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM= -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/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ= github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/felixge/httpsnoop v1.1.0 h1:3YtUj32ZZkqZtt3sZZsClsymw/QDuVfpNhoA31zeORc= @@ -49,8 +47,8 @@ github.com/gkampitakis/go-diff v1.3.2/go.mod h1:LLgOrpqleQe26cte8s36HTWcTmMEur6O github.com/gkampitakis/go-snaps v0.5.15 h1:amyJrvM1D33cPHwVrjo9jQxX8g/7E2wYdZ+01KS3zGE= github.com/gkampitakis/go-snaps v0.5.15/go.mod h1:HNpx/9GoKisdhw9AFOBT1N7DBs9DiHo/hGheFGBZ+mc= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= @@ -113,8 +111,8 @@ github.com/samber/lo v1.53.0 h1:t975lj2py4kJPQ6haz1QMgtId2gtmfktACxIXArw3HM= github.com/samber/lo v1.53.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0= github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -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= @@ -127,18 +125,20 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavM github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= 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.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= -go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= +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.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= -go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +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.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= -go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= -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.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/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.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= diff --git a/sdk/http_test.go b/sdk/http_test.go index 65bef93..961aeaf 100644 --- a/sdk/http_test.go +++ b/sdk/http_test.go @@ -19,9 +19,9 @@ import ( var _ = Describe("HTTP transport", func() { It("reports an inbound capture failure without panicking", func() { agent := Loopback() - defer agent.Close() + defer func() { Expect(agent.Close()).To(Succeed()) }() stream, conn := openAgent(agent) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "capture-error", Probe: "http", Params: json.RawMessage(`{}`)})).To(Succeed()) _, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -51,9 +51,9 @@ var _ = Describe("HTTP transport", func() { }) It("records an inbound request without changing its response", func() { agent := Loopback() - defer agent.Close() + defer func() { Expect(agent.Close()).To(Succeed()) }() stream, conn := openAgent(agent) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "handler-test", Probe: "http", Params: json.RawMessage(`{}`)})).To(Succeed()) _, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -93,9 +93,9 @@ var _ = Describe("HTTP transport", func() { })) defer server.Close() agent := Loopback() - defer agent.Close() + defer func() { Expect(agent.Close()).To(Succeed()) }() stream, conn := openAgent(agent) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "tls-test", Probe: "http", Params: json.RawMessage(`{}`)})).To(Succeed()) _, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -120,9 +120,9 @@ var _ = Describe("HTTP transport", func() { })) defer server.Close() agent := Loopback() - defer agent.Close() + defer func() { Expect(agent.Close()).To(Succeed()) }() stream, conn := openAgent(agent) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "http-test", Probe: "http", Params: json.RawMessage(`{}`)})).To(Succeed()) frame, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) diff --git a/sdk/install_test.go b/sdk/install_test.go index 50ace82..579b768 100644 --- a/sdk/install_test.go +++ b/sdk/install_test.go @@ -26,13 +26,13 @@ var _ = Describe("probe installation", func() { p := &installedProbe{} RegisterProbe(p) a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() b := Loopback() - defer b.Close() + defer func() { Expect(b.Close()).To(Succeed()) }() firstStream, first := openAgent(a) - defer firstStream.Close() + defer func() { Expect(firstStream.Close()).To(Succeed()) }() secondStream, second := openAgent(b) - defer secondStream.Close() + defer func() { Expect(secondStream.Close()).To(Succeed()) }() for _, conn := range []*protocol.Conn{first, second} { Expect(conn.Send("arm", protocol.Arm{Session: "install", Probe: "install-test", Params: json.RawMessage(`{}`)})).To(Succeed()) frame, _, err := conn.Read() diff --git a/sdk/integration_test.go b/sdk/integration_test.go index 2d1ea7f..2a82267 100644 --- a/sdk/integration_test.go +++ b/sdk/integration_test.go @@ -53,9 +53,9 @@ var _ = Describe("SDK capture protocol", func() { previous := runtime.SetMutexProfileFraction(7) defer runtime.SetMutexProfileFraction(previous) a := newAgent(Options{AllowMutation: true}) - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "rates", Probe: "goprof", Params: json.RawMessage(`{"profile":"heap","mutex":true,"block":true}`), AllowMutation: true})).To(Succeed()) frame, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -71,9 +71,9 @@ var _ = Describe("SDK capture protocol", func() { }) It("splits large records into frames below the protocol limit", func() { a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "large", Probe: "stacks", Params: json.RawMessage(`{}`)})).To(Succeed()) _, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -97,7 +97,7 @@ var _ = Describe("SDK capture protocol", func() { }) It("counts a failed batch and ends its session on connection failure", func() { a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) Expect(conn.Send("arm", protocol.Arm{Session: "broken", Probe: "stacks", Params: json.RawMessage(`{}`)})).To(Succeed()) _, _, err := conn.Read() @@ -137,19 +137,19 @@ var _ = Describe("SDK capture protocol", func() { }) It("rejects a concurrent CPU capture from another connection", func() { a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() firstStream, first := openAgent(a) - defer firstStream.Close() + defer func() { Expect(firstStream.Close()).To(Succeed()) }() secondStream, second := openAgent(a) - defer secondStream.Close() + defer func() { Expect(secondStream.Close()).To(Succeed()) }() Expect(armProfile(first, "cpu-first", "cpu", false).Error).To(BeEmpty()) Expect(armProfile(second, "cpu-second", "cpu", false).Error).To(ContainSubstring("already armed")) }) It("counts marshal failures without blocking the recording goroutine", func() { a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "marshal", Probe: "stacks", Params: json.RawMessage(`{}`)})).To(Succeed()) _, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -171,17 +171,17 @@ var _ = Describe("SDK capture protocol", func() { defer runtime.SetMutexProfileFraction(previous) a := newAgent(Options{AllowMutation: true}) a.readTimeout = 50 * time.Millisecond - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(armProfile(conn, "liveness", "mutex", true).Error).To(BeEmpty()) Eventually(func() int { return runtime.SetMutexProfileFraction(-1) }).WithTimeout(time.Second).Should(Equal(7)) }) It("flushes every accepted record before ended on disarm", func() { a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "drain", Probe: "stacks", Params: json.RawMessage(`{}`)})).To(Succeed()) _, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -206,9 +206,9 @@ var _ = Describe("SDK capture protocol", func() { }) It("ends sessions on byte limits and stop times", func() { a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() for _, request := range []protocol.Arm{ {Session: "bytes", Probe: "stacks", Params: json.RawMessage(`{}`), Limits: protocol.Limits{MaxBytes: 1}}, {Session: "deadline", Probe: "stacks", Params: json.RawMessage(`{}`), StopAt: time.Now().Add(100 * time.Millisecond)}, @@ -230,9 +230,9 @@ var _ = Describe("SDK capture protocol", func() { }) It("reports records dropped while a connection cannot drain its ring", func() { a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(conn.Send("arm", protocol.Arm{Session: "drops", Probe: "stacks", Params: json.RawMessage(`{}`)})).To(Succeed()) _, _, err := conn.Read() Expect(err).NotTo(HaveOccurred()) @@ -263,9 +263,9 @@ var _ = Describe("SDK capture protocol", func() { }) It("delivers heap checkpoints and CPU windows as pprof blobs", func() { a := Loopback() - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(armProfile(conn, "heap", "heap", false).Error).To(BeEmpty()) Expect(conn.Send("checkpoint", protocol.Checkpoint{Session: "heap", ID: "reading", Params: json.RawMessage(`{"profile":"heap"}`)})).To(Succeed()) frame, blob, err := conn.Read() @@ -293,9 +293,9 @@ var _ = Describe("SDK capture protocol", func() { Expect(stream.Close()).To(Succeed()) Expect(a.Close()).To(Succeed()) b := newAgent(Options{AllowMutation: true}) - defer b.Close() + defer func() { Expect(b.Close()).To(Succeed()) }() stream, conn = openAgent(b) - defer stream.Close() + defer func() { Expect(stream.Close()).To(Succeed()) }() Expect(armProfile(conn, "caller-denied", "block", false).Error).To(ContainSubstring(ErrCallerMutationDisabled.Error())) }) It("restores mutex and block profiling after a connection drops", func() { @@ -306,7 +306,7 @@ var _ = Describe("SDK capture protocol", func() { runtime.SetBlockProfileRate(0) profileMu.Unlock() a := newAgent(Options{AllowMutation: true}) - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() stream, conn := openAgent(a) Expect(armProfile(conn, "mutex", "mutex", true).Error).To(BeEmpty()) Expect(armProfile(conn, "block", "block", true).Error).To(BeEmpty()) diff --git a/sdk/protocol/conn_test.go b/sdk/protocol/conn_test.go index a11be69..5550658 100644 --- a/sdk/protocol/conn_test.go +++ b/sdk/protocol/conn_test.go @@ -20,8 +20,8 @@ import ( var _ = Describe("framed protocol", func() { It("times out a write when the peer stops reading", func() { left, right := net.Pipe() - defer left.Close() - defer right.Close() + defer func() { Expect(left.Close()).To(Succeed()) }() + defer func() { Expect(right.Close()).To(Succeed()) }() err := protocol.NewConn(left).Send("ping", protocol.Ping{}) Expect(errors.Is(err, os.ErrDeadlineExceeded)).To(BeTrue()) }) diff --git a/sdk/protocol/discovery.go b/sdk/protocol/discovery.go index 1973a28..3a3b22d 100644 --- a/sdk/protocol/discovery.go +++ b/sdk/protocol/discovery.go @@ -43,7 +43,7 @@ func LocalNetwork(address string) (string, error) { } // ReadEndpoint validates the discovery file against its authenticated local agent. -func ReadEndpoint(ctx context.Context, path string) (Endpoint, error) { +func ReadEndpoint(ctx context.Context, path string) (result Endpoint, err error) { data, err := os.ReadFile(path) if err != nil { return Endpoint{}, err @@ -68,7 +68,7 @@ func ReadEndpoint(ctx context.Context, path string) (Endpoint, error) { if err != nil { return Endpoint{}, fmt.Errorf("%w: %v", ErrStaleEndpoint, err) } - defer client.Close() + defer func() { err = errors.Join(err, client.Close()) }() if client.Hello.AgentID != strconv.Itoa(endpoint.PID) || !client.Hello.Started.Equal(endpoint.Started) { return Endpoint{}, fmt.Errorf("%w: identity mismatch", ErrStaleEndpoint) } diff --git a/sdk/resource.go b/sdk/resource.go index 3b622db..bbda2bb 100644 --- a/sdk/resource.go +++ b/sdk/resource.go @@ -3,6 +3,7 @@ package telltale import ( "context" "encoding/json" + "errors" "fmt" "io" "net/http" @@ -35,7 +36,7 @@ func resourceWithCloud(getenv func(string) string, readFile func(string) ([]byte return ecsMetadata(resource, client, getenv("ECS_CONTAINER_METADATA_URI_V4")) } -func otherMetadata(resource map[string]string, client *http.Client) (map[string]string, string) { +func otherMetadata(resource map[string]string, client *http.Client) (result map[string]string, warning string) { var endpoint, header string switch resource["cloud.provider"] { case "gcp": @@ -58,7 +59,7 @@ func otherMetadata(resource map[string]string, client *http.Client) (map[string] if err != nil { return resource, fmt.Sprintf("cloud metadata: %v", err) } - defer response.Body.Close() + defer closeMetadataBody(response.Body, &warning) if response.StatusCode != http.StatusOK { return resource, fmt.Sprintf("cloud metadata: HTTP %s", response.Status) } @@ -86,7 +87,7 @@ func otherMetadata(resource map[string]string, client *http.Client) (map[string] return resource, "" } -func awsMetadata(resource map[string]string, client *http.Client, timeout time.Duration) (map[string]string, string) { +func awsMetadata(resource map[string]string, client *http.Client, timeout time.Duration) (result map[string]string, warning string) { ctx, cancel := context.WithTimeout(context.Background(), timeout) defer cancel() request, err := http.NewRequestWithContext(ctx, http.MethodPut, "http://169.254.169.254/latest/api/token", nil) @@ -99,7 +100,7 @@ func awsMetadata(resource map[string]string, client *http.Client, timeout time.D return resource, fmt.Sprintf("cloud metadata: %v", err) } token, err := io.ReadAll(io.LimitReader(response.Body, 4096)) - _ = response.Body.Close() + err = errors.Join(err, response.Body.Close()) if err != nil || response.StatusCode != http.StatusOK { return resource, fmt.Sprintf("cloud metadata: token request failed: %v (%s)", err, response.Status) } @@ -112,7 +113,7 @@ func awsMetadata(resource map[string]string, client *http.Client, timeout time.D if err != nil { return resource, fmt.Sprintf("cloud metadata: %v", err) } - defer response.Body.Close() + defer closeMetadataBody(response.Body, &warning) if response.StatusCode != http.StatusOK { return resource, fmt.Sprintf("cloud metadata: HTTP %s", response.Status) } @@ -132,12 +133,12 @@ func awsMetadata(resource map[string]string, client *http.Client, timeout time.D return resource, "" } -func ecsMetadata(resource map[string]string, client *http.Client, address string) (map[string]string, string) { +func ecsMetadata(resource map[string]string, client *http.Client, address string) (result map[string]string, warning string) { response, err := client.Get(strings.TrimRight(address, "/") + "/task") if err != nil { return resource, fmt.Sprintf("cloud metadata: %v", err) } - defer response.Body.Close() + defer closeMetadataBody(response.Body, &warning) if response.StatusCode != http.StatusOK { return resource, fmt.Sprintf("cloud metadata: HTTP %s", response.Status) } @@ -161,6 +162,15 @@ func ecsMetadata(resource map[string]string, client *http.Client, address string return resource, "" } +func closeMetadataBody(body io.Closer, warning *string) { + if err := body.Close(); err != nil { + if *warning != "" { + *warning += "; " + } + *warning += fmt.Sprintf("cloud metadata response close: %v", err) + } +} + func detectResource(getenv func(string) string, readFile func(string) ([]byte, error)) map[string]string { resource := map[string]string{"process.pid": strconv.Itoa(os.Getpid()), "process.runtime.name": "go", "process.runtime.version": runtime.Version()} if host, err := os.Hostname(); err == nil { diff --git a/sdk/resource_test.go b/sdk/resource_test.go index b80bf5e..9dec934 100644 --- a/sdk/resource_test.go +++ b/sdk/resource_test.go @@ -2,6 +2,7 @@ package telltale import ( "errors" + "io" "net/http" "net/http/httptest" "os" @@ -12,7 +13,51 @@ import ( . "github.com/onsi/gomega" ) +type metadataTransport func(*http.Request) (*http.Response, error) + +func (f metadataTransport) RoundTrip(r *http.Request) (*http.Response, error) { return f(r) } + +type metadataBody struct { + io.Reader + err error +} + +func (b metadataBody) Close() error { return b.err } + var _ = Describe("resource detection", func() { + DescribeTable("reports response close failures from cloud metadata", func(provider string, status int) { + closeErr := errors.New("metadata response close failed") + client := &http.Client{Transport: metadataTransport(func(r *http.Request) (*http.Response, error) { + if r.Method == http.MethodPut { + return &http.Response{StatusCode: http.StatusOK, Body: io.NopCloser(strings.NewReader("token"))}, nil + } + body := `{}` + if provider == "gcp" { + body = "example-project" + } + return &http.Response{StatusCode: status, Status: http.StatusText(status), Body: metadataBody{Reader: strings.NewReader(body), err: closeErr}}, nil + })} + resource := map[string]string{"cloud.provider": provider} + var warning string + switch provider { + case "aws": + _, warning = awsMetadata(resource, client, time.Second) + case "ecs": + _, warning = ecsMetadata(resource, client, "http://metadata.example") + default: + _, warning = otherMetadata(resource, client) + } + Expect(warning).To(ContainSubstring(closeErr.Error())) + if status != http.StatusOK { + Expect(warning).To(ContainSubstring(http.StatusText(status))) + } + }, + Entry("GCP", "gcp", http.StatusOK), + Entry("Azure", "azure", http.StatusOK), + Entry("AWS", "aws", http.StatusOK), + Entry("ECS", "ecs", http.StatusOK), + Entry("HTTP error", "ecs", http.StatusForbidden), + ) It("enables metadata detection from the environment at startup", func() { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { _, _ = w.Write([]byte(`{"Cluster":"from-env"}`)) })) defer server.Close() @@ -21,7 +66,7 @@ var _ = Describe("resource detection", func() { GinkgoT().Setenv("ECS_CONTAINER_METADATA_URI_V4", server.URL) a, err := Start(Options{Listen: "tcp"}) Expect(err).NotTo(HaveOccurred()) - defer a.Close() + defer func() { Expect(a.Close()).To(Succeed()) }() Expect(a.endpoint.Resource).To(HaveKeyWithValue("aws.ecs.cluster.name", "from-env")) }) It("does not route metadata requests through environment proxies", func() { diff --git a/sdk/slog.go b/sdk/slog.go index e57430b..94c5fa5 100644 --- a/sdk/slog.go +++ b/sdk/slog.go @@ -91,7 +91,7 @@ func (logProbe) Arm(_ context.Context, raw json.RawMessage, sink Sink) (func() e var releaseAdapter func() error if adapter != nil { var err error - releaseAdapter, err = adapter(LogOptions{Levels: params.Levels, MinLevel: params.MinLevel, Match: params.Match}, sink) + releaseAdapter, err = adapter(LogOptions(params), sink) if err != nil { return nil, err } diff --git a/sdk/spans_test.go b/sdk/spans_test.go index f2d344a..4726fdf 100644 --- a/sdk/spans_test.go +++ b/sdk/spans_test.go @@ -44,9 +44,9 @@ var _ = Describe("manual spans", func() { }) It("records parent and child spans with attributes and errors", 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())