From 5f868e2c09ad4c4ed0bb2507a62e459deea61441 Mon Sep 17 00:00:00 2001 From: Jared Harper Date: Fri, 19 Apr 2024 09:23:59 -0700 Subject: [PATCH 1/9] Add golangci-lint to GHA --- .github/workflows/test.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a0055483..fb5fa427 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -19,6 +19,19 @@ jobs: steps: - uses: actions/checkout@v3 - uses: Jerome1337/gofmt-action@v1.0.5 + golangci: + name: lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: '1.22' + cache: false + - name: golangci-lint + uses: golangci/golangci-lint-action@v4 + with: + version: v1.54 tests: runs-on: ubuntu-latest strategy: From 2608e26c5614d06f278d125073d763bd58536695 Mon Sep 17 00:00:00 2001 From: Jared Harper Date: Fri, 19 Apr 2024 09:32:17 -0700 Subject: [PATCH 2/9] Use separate file, enable checks --- .github/workflows/golangci-lint.yml | 26 ++++++++++++++++++++++++++ .github/workflows/test.yaml | 13 ------------- 2 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 .github/workflows/golangci-lint.yml diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml new file mode 100644 index 00000000..b3bad00f --- /dev/null +++ b/.github/workflows/golangci-lint.yml @@ -0,0 +1,26 @@ +name: golangci-lint +on: + push: + branches: + - master + - main + pull_request: + +permissions: + contents: read + checks: write + +jobs: + golangci: + name: lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: '1.22' + cache: false + - name: golangci-lint + uses: golangci/golangci-lint-action@v4 + with: + version: v1.54 \ No newline at end of file diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index fb5fa427..a0055483 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -19,19 +19,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: Jerome1337/gofmt-action@v1.0.5 - golangci: - name: lint - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: '1.22' - cache: false - - name: golangci-lint - uses: golangci/golangci-lint-action@v4 - with: - version: v1.54 tests: runs-on: ubuntu-latest strategy: From 6a69047d54de15f9e381786fad313e7008a00ca2 Mon Sep 17 00:00:00 2001 From: Jared Harper Date: Fri, 19 Apr 2024 10:55:31 -0700 Subject: [PATCH 3/9] Pass golangci-lint --- internal/hdrhist/encode.go | 39 ++++++++++++++++++------- internal/hdrhist/hist.go | 4 --- internal/hdrhist/log_writer.go | 8 +++-- internal/log/logging.go | 2 +- internal/metrics/metrics.go | 3 +- internal/metrics/metrics_linux_test.go | 3 +- internal/metrics/metrics_test.go | 39 ++++++++++++++++--------- internal/reporter/log_writer.go | 2 +- internal/reporter/log_writer_test.go | 17 +++++++---- internal/reporter/methods_test.go | 2 +- internal/reporter/reporter_grpc_test.go | 27 ++++++++++++----- internal/utils/utils.go | 5 +++- swo/agent.go | 4 +-- swo/agent_test.go | 8 +++-- 14 files changed, 108 insertions(+), 55 deletions(-) diff --git a/internal/hdrhist/encode.go b/internal/hdrhist/encode.go index 06b05c9a..bc56cec0 100644 --- a/internal/hdrhist/encode.go +++ b/internal/hdrhist/encode.go @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. + package hdrhist import ( @@ -27,10 +28,13 @@ func EncodeCompressed(h *Hist) ([]byte, error) { var buf bytes.Buffer b64w := base64.NewEncoder(base64.StdEncoding, &buf) if err := encodeCompressed(h, b64w, h.Max()); err != nil { - b64w.Close() + _ = b64w.Close() return nil, errors.Wrap(err, "unable to encode histogram") } - b64w.Close() // DO NOT defer this close, otherwise that could prevent bytes from getting flushed + // DO NOT defer this close, otherwise that could prevent bytes from getting flushed + if err := b64w.Close(); err != nil { + return nil, err + } return buf.Bytes(), nil } @@ -39,15 +43,22 @@ func encodeCompressed(h *Hist, w io.Writer, histMax int64) error { var buf bytes.Buffer var cookie int32 = compressedEncodingCookie - binary.Write(&buf, binary.BigEndian, cookie) + err := binary.Write(&buf, binary.BigEndian, cookie) + if err != nil { + return err + } buf.WriteString("\x00\x00\x00\x00") preCompressed := buf.Len() zw, _ := zlib.NewWriterLevel(&buf, zlib.BestCompression) - encodeInto(h, zw, histMax) // won't error, not io device - zw.Close() + if err = encodeInto(h, zw, histMax); err != nil { + return err + } + if err = zw.Close(); err != nil { + return err + } binary.BigEndian.PutUint32(buf.Bytes()[4:], uint32(buf.Len()-preCompressed)) - _, err := buf.WriteTo(w) + _, err = buf.WriteTo(w) return errors.Wrap(err, "unable to write compressed hist") } @@ -57,13 +68,21 @@ func encodeInto(h *Hist, w io.Writer, max int64) error { importantLen := h.b.countsIndex(max) + 1 var buf bytes.Buffer var cookie int32 = encodingCookie - binary.Write(&buf, binary.BigEndian, cookie) + if err := binary.Write(&buf, binary.BigEndian, cookie); err != nil { + return err + } buf.WriteString("\x00\x00\x00\x00") // length will go here buf.WriteString("\x00\x00\x00\x00") // normalizing index offset cfg := h.Config() - binary.Write(&buf, binary.BigEndian, int32(cfg.SigFigs)) - binary.Write(&buf, binary.BigEndian, int64(cfg.LowestDiscernible)) - binary.Write(&buf, binary.BigEndian, int64(cfg.HighestTrackable)) + if err := binary.Write(&buf, binary.BigEndian, cfg.SigFigs); err != nil { + return err + } + if err := binary.Write(&buf, binary.BigEndian, cfg.LowestDiscernible); err != nil { + return err + } + if err := binary.Write(&buf, binary.BigEndian, cfg.HighestTrackable); err != nil { + return err + } // int to double conversion ratio buf.WriteString("\x3f\xf0\x00\x00\x00\x00\x00\x00") payloadStart := buf.Len() diff --git a/internal/hdrhist/hist.go b/internal/hdrhist/hist.go index 23e26163..eee68915 100644 --- a/internal/hdrhist/hist.go +++ b/internal/hdrhist/hist.go @@ -191,11 +191,7 @@ func (b *buckets) valueFor(i int) int64 { func (b *buckets) sizeOfEquivalentValueRange(v int64) int64 { bi := bucketIndex(v, b.subMask, b.leadZeroCountBase) - sbi := subBucketIndex(v, bi, b.unitMag) t := bi - if sbi >= int(b.subCount) { - bi++ - } nextDist := int64(1) << uint64(int64(b.unitMag)+int64(t)) return nextDist } diff --git a/internal/hdrhist/log_writer.go b/internal/hdrhist/log_writer.go index 1617b5f6..3234b95d 100644 --- a/internal/hdrhist/log_writer.go +++ b/internal/hdrhist/log_writer.go @@ -92,8 +92,12 @@ func (l *LogWriter) writeHist(h *Hist, start time.Time, end time.Time) error { float64(end.Sub(start)/1e6)/1e3, float64(max)/MaxValueUnitRatio) b64w := base64.NewEncoder(base64.StdEncoding, &l.buf) - encodeCompressed(h, b64w, max) // not writing to disk yet, won't fail - b64w.Close() + if err := encodeCompressed(h, b64w, max); err != nil { + return err + } + if err := b64w.Close(); err != nil { + return err + } l.buf.WriteString("\n") _, err := l.buf.WriteTo(l.w) return errors.Wrap(err, "unable to write hist") diff --git a/internal/log/logging.go b/internal/log/logging.go index 3abfc270..a92e031a 100644 --- a/internal/log/logging.go +++ b/internal/log/logging.go @@ -193,7 +193,7 @@ func logIt(level LogLevel, msg string, args []interface{}) { buffer.WriteString(pre) - s := msg + var s string if msg == "" { s = fmt.Sprint(args...) } else { diff --git a/internal/metrics/metrics.go b/internal/metrics/metrics.go index f343a410..d7aa06cb 100644 --- a/internal/metrics/metrics.go +++ b/internal/metrics/metrics.go @@ -985,7 +985,6 @@ func BuildServerlessMessage(span HTTPSpanMessage, rcs map[string]*RateCounts, ra } if ttTraced != 0 { bbuf.AppendString(strconv.Itoa(i), "Triggered") - i++ } bbuf.AppendFinishObject(start) @@ -1038,7 +1037,7 @@ func RecordSpan(span sdktrace.ReadOnlySpan, isAppoptics bool) { Method: method, } - var tagsList []map[string]string = nil + var tagsList []map[string]string var metricName string if !isAppoptics { tagsList = []map[string]string{swoTags} diff --git a/internal/metrics/metrics_linux_test.go b/internal/metrics/metrics_linux_test.go index ad4b0224..adfac8f2 100644 --- a/internal/metrics/metrics_linux_test.go +++ b/internal/metrics/metrics_linux_test.go @@ -29,7 +29,8 @@ func TestAppendUname(t *testing.T) { bbuf := bson.NewBuffer() appendUname(bbuf) bbuf.Finish() - m := bsonToMap(bbuf) + m, err := bsonToMap(bbuf) + require.NoError(t, err) var sysname, release string diff --git a/internal/metrics/metrics_test.go b/internal/metrics/metrics_test.go index 2ad1a1ab..8e5492b1 100644 --- a/internal/metrics/metrics_test.go +++ b/internal/metrics/metrics_test.go @@ -24,6 +24,7 @@ import ( "github.com/solarwinds/apm-go/internal/log" "github.com/solarwinds/apm-go/internal/swotel/semconv" "github.com/solarwinds/apm-go/internal/testutils" + "github.com/stretchr/testify/require" sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/trace" "math" @@ -38,10 +39,12 @@ import ( mbson "gopkg.in/mgo.v2/bson" ) -func bsonToMap(bbuf *bson.Buffer) map[string]interface{} { +func bsonToMap(bbuf *bson.Buffer) (map[string]interface{}, error) { m := make(map[string]interface{}) - mbson.Unmarshal(bbuf.GetBuf(), m) - return m + if err := mbson.Unmarshal(bbuf.GetBuf(), m); err != nil { + return nil, err + } + return m, nil } func round(val float64, roundOn float64, places int) (newVal float64) { @@ -62,7 +65,8 @@ func TestAppendIPAddresses(t *testing.T) { bbuf := bson.NewBuffer() appendIPAddresses(bbuf) bbuf.Finish() - m := bsonToMap(bbuf) + m, err := bsonToMap(bbuf) + require.NoError(t, err) ifaces, _ := host.FilteredIfaces() var addresses []string @@ -94,7 +98,8 @@ func TestAppendMACAddresses(t *testing.T) { bbuf := bson.NewBuffer() appendMACAddresses(bbuf, host.CurrentID().MAC()) bbuf.Finish() - m := bsonToMap(bbuf) + m, err := bsonToMap(bbuf) + require.NoError(t, err) ifaces, _ := host.FilteredIfaces() var macs []string @@ -131,7 +136,8 @@ func TestAddMetricsValue(t *testing.T) { addMetricsValue(bbuf, &index, "name4", float64(444.44)) addMetricsValue(bbuf, &index, "name5", "hello") bbuf.Finish() - m := bsonToMap(bbuf) + m, err := bsonToMap(bbuf) + require.NoError(t, err) assert.NotZero(t, m["0"]) m2 := m["0"].(map[string]interface{}) @@ -223,8 +229,10 @@ func TestRecordMeasurement(t *testing.T) { t1 := make(map[string]string) t1["t1"] = "tag1" t1["t2"] = "tag2" - me.recordWithSoloTags("name1", t1, 111.11, 1, false) - me.recordWithSoloTags("name1", t1, 222, 1, false) + err := me.recordWithSoloTags("name1", t1, 111.11, 1, false) + require.NoError(t, err) + err = me.recordWithSoloTags("name1", t1, 222, 1, false) + require.NoError(t, err) assert.NotNil(t, me.m["name1&false&t1:tag1&t2:tag2&"]) m := me.m["name1&false&t1:tag1&t2:tag2&"] assert.Equal(t, "tag1", m.Tags["t1"]) @@ -235,7 +243,8 @@ func TestRecordMeasurement(t *testing.T) { t2 := make(map[string]string) t2["t3"] = "tag3" - me.recordWithSoloTags("name2", t2, 123.456, 3, true) + err = me.recordWithSoloTags("name2", t2, 123.456, 3, true) + require.NoError(t, err) assert.NotNil(t, me.m["name2&true&t3:tag3&"]) m = me.m["name2&true&t3:tag3&"] assert.Equal(t, "tag3", m.Tags["t3"]) @@ -305,7 +314,8 @@ func TestAddMeasurementToBSON(t *testing.T) { addMeasurementToBSON(bbuf, &index, measurement1) addMeasurementToBSON(bbuf, &index, measurement2) bbuf.Finish() - m := bsonToMap(bbuf) + m, err := bsonToMap(bbuf) + require.NoError(t, err) assert.NotZero(t, m["0"]) m1 := m["0"].(map[string]interface{}) @@ -365,7 +375,8 @@ func TestAddHistogramToBSON(t *testing.T) { addHistogramToBSON(bbuf, &index, h1) addHistogramToBSON(bbuf, &index, h2) bbuf.Finish() - m := bsonToMap(bbuf) + m, err := bsonToMap(bbuf) + require.NoError(t, err) assert.NotZero(t, m["0"]) m1 := m["0"].(map[string]interface{}) @@ -392,7 +403,8 @@ func TestGenerateMetricsMessage(t *testing.T) { RCRegular: {10, 2, 5, 5, 1}, RCRelaxedTriggerTrace: {3, 0, 1, 2, 0}, RCStrictTriggerTrace: {4, 0, 3, 1, 0}}, true)) - m := bsonToMap(bbuf) + m, err := bsonToMap(bbuf) + require.NoError(t, err) _, ok := m["Hostname"] assert.False(t, ok) @@ -477,8 +489,9 @@ func TestGenerateMetricsMessage(t *testing.T) { } } - m = bsonToMap(bson.WithBuf(BuildBuiltinMetricsMessage(testMetrics, &EventQueueStats{}, + m, err = bsonToMap(bson.WithBuf(BuildBuiltinMetricsMessage(testMetrics, &EventQueueStats{}, map[string]*RateCounts{RCRegular: {}, RCRelaxedTriggerTrace: {}, RCStrictTriggerTrace: {}}, true))) + require.NoError(t, err) assert.NotNil(t, m["TransactionNameOverflow"]) assert.True(t, m["TransactionNameOverflow"].(bool)) diff --git a/internal/reporter/log_writer.go b/internal/reporter/log_writer.go index 97b0fdf2..d381b7de 100644 --- a/internal/reporter/log_writer.go +++ b/internal/reporter/log_writer.go @@ -132,7 +132,7 @@ func (lr *logWriter) flush() error { } if file, ok := lr.dest.(*os.File); ok { - file.Sync() + return file.Sync() } return nil diff --git a/internal/reporter/log_writer_test.go b/internal/reporter/log_writer_test.go index 2eed93a2..12ff2db7 100644 --- a/internal/reporter/log_writer_test.go +++ b/internal/reporter/log_writer_test.go @@ -15,6 +15,7 @@ package reporter import ( "github.com/solarwinds/apm-go/internal/utils" + "github.com/stretchr/testify/require" "testing" "github.com/stretchr/testify/assert" @@ -23,14 +24,16 @@ import ( func TestLogWriter(t *testing.T) { sb := &utils.SafeBuffer{} eventWriter := newLogWriter(false, sb, 1e6) - eventWriter.Write(EventWT, []byte("hello event")) + _, err := eventWriter.Write(EventWT, []byte("hello event")) + require.NoError(t, err) assert.Equal(t, 0, sb.Len()) - eventWriter.Flush() + require.NoError(t, eventWriter.Flush()) assert.Equal(t, "{\"apm-data\":{\"events\":[\"aGVsbG8gZXZlbnQ=\"]}}\n", sb.String()) sb.Reset() metricWriter := newLogWriter(true, sb, 1e6) - metricWriter.Write(MetricWT, []byte("hello metric")) + _, err = metricWriter.Write(MetricWT, []byte("hello metric")) + require.NoError(t, err) assert.Equal(t, "{\"apm-data\":{\"metrics\":[\"aGVsbG8gbWV0cmlj\"]}}\n", sb.String()) assert.NotNil(t, metricWriter.Flush()) @@ -40,12 +43,14 @@ func TestLogWriter(t *testing.T) { assert.Zero(t, n) assert.Error(t, err) - writer.Write(EventWT, []byte("hello")) + _, err = writer.Write(EventWT, []byte("hello")) + require.NoError(t, err) assert.Zero(t, sb.Len()) - writer.Write(EventWT, []byte(" event")) + _, err = writer.Write(EventWT, []byte(" event")) + require.NoError(t, err) assert.Equal(t, 37, sb.Len()) assert.Equal(t, "{\"apm-data\":{\"events\":[\"aGVsbG8=\"]}}\n", sb.String()) - writer.Flush() + require.NoError(t, writer.Flush()) assert.Equal(t, "{\"apm-data\":{\"events\":[\"aGVsbG8=\"]}}\n{\"apm-data\":{\"events\":[\"IGV2ZW50\"]}}\n", sb.String()) diff --git a/internal/reporter/methods_test.go b/internal/reporter/methods_test.go index a46eef78..7321760f 100644 --- a/internal/reporter/methods_test.go +++ b/internal/reporter/methods_test.go @@ -152,7 +152,7 @@ func TestGenericMethod(t *testing.T) { err := errors.New("err connection aborted") mockTC.On("Ping", mock.Anything, mock.Anything). Return(nil, err) - pe.Call(context.Background(), mockTC) + _ = pe.Call(context.Background(), mockTC) assert.Contains(t, pe.CallSummary(), err.Error()) } diff --git a/internal/reporter/reporter_grpc_test.go b/internal/reporter/reporter_grpc_test.go index f810efdb..e9809363 100644 --- a/internal/reporter/reporter_grpc_test.go +++ b/internal/reporter/reporter_grpc_test.go @@ -74,7 +74,9 @@ func StartTestGRPCServer(t *testing.T, addr string) *TestGRPCServer { pb.RegisterTraceCollectorServer(grpcServer, testServer) require.NoError(t, err) - go grpcServer.Serve(lis) + go func() { + _ = grpcServer.Serve(lis) + }() return testServer } @@ -176,10 +178,14 @@ func (p *TestProxyServer) Start() error { } switch p.url.Scheme { case "http": - go srv.ListenAndServe() + go func() { + _ = srv.ListenAndServe() + }() p.closeFunc = closeFunc case "https": - go srv.ListenAndServeTLS(p.pemFile, p.keyFile) + go func() { + _ = srv.ListenAndServeTLS(p.pemFile, p.keyFile) + }() p.closeFunc = closeFunc // TODO: case "socks5": default: @@ -211,7 +217,9 @@ func (p *TestProxyServer) proxyHttpHandler(w http.ResponseWriter, r *http.Reques subtle.ConstantTimeCompare([]byte(pwd), []byte(expectedPwd)) != 1 { w.Header().Set("WWW-Authenticate", `Basic realm="wrong auth"`) w.WriteHeader(401) - w.Write([]byte("Unauthorised.\n")) + if _, err := w.Write([]byte("Unauthorised.\n")); err != nil { + panic(err) + } return } @@ -231,7 +239,10 @@ func (p *TestProxyServer) proxyHttpHandler(w http.ResponseWriter, r *http.Reques http.Error(w, err.Error(), http.StatusInternalServerError) return } - clientConn.Write([]byte("HTTP/1.0 200 OK\r\n\r\n")) + _, err = clientConn.Write([]byte("HTTP/1.0 200 OK\r\n\r\n")) + if err != nil { + panic(err) + } go forward(serverConn, clientConn) go forward(clientConn, serverConn) @@ -239,10 +250,10 @@ func (p *TestProxyServer) proxyHttpHandler(w http.ResponseWriter, r *http.Reques func forward(dst io.WriteCloser, src io.ReadCloser) { defer func() { - dst.Close() - src.Close() + _ = dst.Close() + _ = src.Close() }() - io.Copy(dst, src) + _, _ = io.Copy(dst, src) } func TestAppopticsCertificate(t *testing.T) { diff --git a/internal/utils/utils.go b/internal/utils/utils.go index e3389726..36e9c1f6 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -29,7 +29,10 @@ import ( // SPrintBson prints the BSON message. It's not concurrent-safe and is for testing only func SPrintBson(message []byte) string { m := make(map[string]interface{}) - bson.Unmarshal(message, m) + if err := bson.Unmarshal(message, m); err != nil { + // Since this is only used in testing/debug, we'll just return the error message + return err.Error() + } b, _ := json.MarshalIndent(m, "", " ") return string(b) } diff --git a/swo/agent.go b/swo/agent.go index 86a9e511..ac81655f 100644 --- a/swo/agent.go +++ b/swo/agent.go @@ -92,8 +92,8 @@ func SetLogOutput(w io.Writer) { } // SetServiceKey sets the service key of the agent -func SetServiceKey(key string) { - reporter.SetServiceKey(key) +func SetServiceKey(key string) error { + return reporter.SetServiceKey(key) } func createResource(resourceAttrs ...attribute.KeyValue) (*resource.Resource, error) { diff --git a/swo/agent_test.go b/swo/agent_test.go index da37c266..370254e9 100644 --- a/swo/agent_test.go +++ b/swo/agent_test.go @@ -44,11 +44,11 @@ func TestSetGetLogLevel(t *testing.T) { newLevel := GetLogLevel() assert.Equal(t, newLevel, nl) - SetLogLevel(oldLevel) + require.NoError(t, SetLogLevel(oldLevel)) } func TestShutdown(t *testing.T) { - Shutdown(context.Background()) + require.NoError(t, Shutdown(context.Background())) assert.True(t, Closed()) ctx, cancel := context.WithTimeout(context.Background(), time.Hour*24) defer cancel() @@ -58,7 +58,9 @@ func TestShutdown(t *testing.T) { func TestSetLogOutput(t *testing.T) { oldLevel := GetLogLevel() _ = SetLogLevel("DEBUG") - defer SetLogLevel(oldLevel) + defer func() { + require.NoError(t, SetLogLevel(oldLevel)) + }() var buf utils.SafeBuffer log.SetOutput(&buf) From 893a2dc9433e9aea1ff603864689432bc72cb286 Mon Sep 17 00:00:00 2001 From: Jared Harper Date: Fri, 19 Apr 2024 10:57:42 -0700 Subject: [PATCH 4/9] fix require --- examples/grpc/go.mod | 14 +++++++------- examples/grpc/go.sum | 7 +++++++ examples/http/go.mod | 16 ++++++++-------- examples/http/go.sum | 8 ++++++++ internal/metrics/metrics_linux_test.go | 1 + 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/examples/grpc/go.mod b/examples/grpc/go.mod index fae80e73..fdb20fa2 100644 --- a/examples/grpc/go.mod +++ b/examples/grpc/go.mod @@ -22,15 +22,15 @@ replace github.com/solarwinds/apm-go => ../.. require ( github.com/solarwinds/apm-go v0.1.1 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 - go.opentelemetry.io/otel v1.20.0 + go.opentelemetry.io/otel v1.21.0 google.golang.org/grpc v1.59.0 google.golang.org/protobuf v1.31.0 ) require ( - github.com/aws/aws-sdk-go-v2 v1.22.2 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3 // indirect - github.com/aws/smithy-go v1.16.0 // indirect + github.com/aws/aws-sdk-go-v2 v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.5 // indirect + github.com/aws/smithy-go v1.17.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/coocood/freecache v1.2.4 // indirect github.com/go-logr/logr v1.3.0 // indirect @@ -39,9 +39,9 @@ require ( github.com/google/uuid v1.4.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/solarwinds/apm-proto v0.0.0-20231107001908-432e697887b6 // indirect - go.opentelemetry.io/otel/metric v1.20.0 // indirect - go.opentelemetry.io/otel/sdk v1.20.0 // indirect - go.opentelemetry.io/otel/trace v1.20.0 // indirect + go.opentelemetry.io/otel/metric v1.21.0 // indirect + go.opentelemetry.io/otel/sdk v1.21.0 // indirect + go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/atomic v1.11.0 // indirect golang.org/x/net v0.18.0 // indirect golang.org/x/sys v0.14.0 // indirect diff --git a/examples/grpc/go.sum b/examples/grpc/go.sum index 414fbe53..909a99ec 100644 --- a/examples/grpc/go.sum +++ b/examples/grpc/go.sum @@ -2,10 +2,13 @@ cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopT cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= github.com/aws/aws-sdk-go-v2 v1.22.2 h1:lV0U8fnhAnPz8YcdmZVV60+tr6CakHzqA6P8T46ExJI= github.com/aws/aws-sdk-go-v2 v1.22.2/go.mod h1:Kd0OJtkW3Q0M0lUWGszapWjEvrXDzRW+D21JNsroB+c= +github.com/aws/aws-sdk-go-v2 v1.23.1/go.mod h1:i1XDttT4rnf6vxc9AuskLc6s7XBee8rlLilKlc03uAA= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3 h1:G5KawTAkyHH6WyKQCdHiW4h3PmAXNJpOgwKg3H7sDRE= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3/go.mod h1:hugKmSFnZB+HgNI1sYGT14BUPZkO6alC/e0AWu+0IAQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.5/go.mod h1:VhnExhw6uXy9QzetvpXDolo1/hjhx4u9qukBGkuUwjs= github.com/aws/smithy-go v1.16.0 h1:gJZEH/Fqh+RsvlJ1Zt4tVAtV6bKkp3cC+R6FCZMNzik= github.com/aws/smithy-go v1.16.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= +github.com/aws/smithy-go v1.17.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -37,12 +40,16 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.4 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs= +go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA= go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM= +go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.20.0 h1:5Jf6imeFZlZtKv9Qbo6qt2ZkmWtdWx/wzcCbNUlAWGM= go.opentelemetry.io/otel/sdk v1.20.0/go.mod h1:rmkSx1cZCm/tn16iWDn1GQbLtsW/LvsdEEFzCSRM6V0= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ= go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU= +go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= diff --git a/examples/http/go.mod b/examples/http/go.mod index e7198210..58296d83 100644 --- a/examples/http/go.mod +++ b/examples/http/go.mod @@ -23,15 +23,15 @@ require ( github.com/XSAM/otelsql v0.26.0 github.com/mattn/go-sqlite3 v1.14.18 github.com/solarwinds/apm-go v0.1.1 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 - go.opentelemetry.io/otel v1.20.0 - go.opentelemetry.io/otel/trace v1.20.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 + go.opentelemetry.io/otel v1.21.0 + go.opentelemetry.io/otel/trace v1.21.0 ) require ( - github.com/aws/aws-sdk-go-v2 v1.22.2 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3 // indirect - github.com/aws/smithy-go v1.16.0 // indirect + github.com/aws/aws-sdk-go-v2 v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.5 // indirect + github.com/aws/smithy-go v1.17.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/coocood/freecache v1.2.4 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect @@ -41,8 +41,8 @@ require ( github.com/google/uuid v1.4.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/solarwinds/apm-proto v0.0.0-20231107001908-432e697887b6 // indirect - go.opentelemetry.io/otel/metric v1.20.0 // indirect - go.opentelemetry.io/otel/sdk v1.20.0 // indirect + go.opentelemetry.io/otel/metric v1.21.0 // indirect + go.opentelemetry.io/otel/sdk v1.21.0 // indirect go.uber.org/atomic v1.11.0 // indirect golang.org/x/net v0.18.0 // indirect golang.org/x/sys v0.14.0 // indirect diff --git a/examples/http/go.sum b/examples/http/go.sum index 79b7eda5..15aed5cd 100644 --- a/examples/http/go.sum +++ b/examples/http/go.sum @@ -2,10 +2,13 @@ github.com/XSAM/otelsql v0.26.0 h1:UhAGVBD34Ctbh2aYcm/JAdL+6T6ybrP+YMWYkHqCdmo= github.com/XSAM/otelsql v0.26.0/go.mod h1:5ciw61eMSh+RtTPN8spvPEPLJpAErZw8mFFPNfYiaxA= github.com/aws/aws-sdk-go-v2 v1.22.2 h1:lV0U8fnhAnPz8YcdmZVV60+tr6CakHzqA6P8T46ExJI= github.com/aws/aws-sdk-go-v2 v1.22.2/go.mod h1:Kd0OJtkW3Q0M0lUWGszapWjEvrXDzRW+D21JNsroB+c= +github.com/aws/aws-sdk-go-v2 v1.23.1/go.mod h1:i1XDttT4rnf6vxc9AuskLc6s7XBee8rlLilKlc03uAA= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3 h1:G5KawTAkyHH6WyKQCdHiW4h3PmAXNJpOgwKg3H7sDRE= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3/go.mod h1:hugKmSFnZB+HgNI1sYGT14BUPZkO6alC/e0AWu+0IAQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.5/go.mod h1:VhnExhw6uXy9QzetvpXDolo1/hjhx4u9qukBGkuUwjs= github.com/aws/smithy-go v1.16.0 h1:gJZEH/Fqh+RsvlJ1Zt4tVAtV6bKkp3cC+R6FCZMNzik= github.com/aws/smithy-go v1.16.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= +github.com/aws/smithy-go v1.17.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -37,15 +40,20 @@ github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 h1:1eHu3/pUSWaOgltNK3WJFaywKsTIr/PwvHyDmi0lQA0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0/go.mod h1:HyABWq60Uy1kjJSa2BVOxUVao8Cdick5AWSKPutqy6U= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs= +go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA= go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM= +go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.20.0 h1:5Jf6imeFZlZtKv9Qbo6qt2ZkmWtdWx/wzcCbNUlAWGM= go.opentelemetry.io/otel/sdk v1.20.0/go.mod h1:rmkSx1cZCm/tn16iWDn1GQbLtsW/LvsdEEFzCSRM6V0= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k= go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ= go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU= +go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= diff --git a/internal/metrics/metrics_linux_test.go b/internal/metrics/metrics_linux_test.go index adfac8f2..8b560a08 100644 --- a/internal/metrics/metrics_linux_test.go +++ b/internal/metrics/metrics_linux_test.go @@ -18,6 +18,7 @@ package metrics import ( "github.com/solarwinds/apm-go/internal/bson" "github.com/solarwinds/apm-go/internal/utils" + "github.com/stretchr/testify/require" "strings" "syscall" "testing" From 89082392d82c5bdf670733bd57ca5fa9e9722af0 Mon Sep 17 00:00:00 2001 From: Jared Harper Date: Fri, 19 Apr 2024 11:02:09 -0700 Subject: [PATCH 5/9] maybe fix the golangci-lint fix on linux --- internal/host/sys_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/host/sys_linux.go b/internal/host/sys_linux.go index 90fb154e..6a5ff39e 100644 --- a/internal/host/sys_linux.go +++ b/internal/host/sys_linux.go @@ -68,7 +68,7 @@ func initDistro() (distro string) { distro = utils.GetStrByKeyword(SUSE, "PRETTY_NAME") if distro != "" { // TODO - //lint:ignore SA1024 This is untested so until we have coverage I'm not inclined to fix this + //nolint:staticcheck This is untested so until we have coverage I'm not inclined to fix this distro = strings.TrimLeft(distro, "PRETTY_NAME=") distro = strings.Trim(distro, "\"") return distro From 66386c8575e74f181b94466622949869fc1d8e28 Mon Sep 17 00:00:00 2001 From: Jared Harper Date: Fri, 19 Apr 2024 11:03:14 -0700 Subject: [PATCH 6/9] Fix comment --- internal/host/sys_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/host/sys_linux.go b/internal/host/sys_linux.go index 6a5ff39e..420f07c9 100644 --- a/internal/host/sys_linux.go +++ b/internal/host/sys_linux.go @@ -68,7 +68,7 @@ func initDistro() (distro string) { distro = utils.GetStrByKeyword(SUSE, "PRETTY_NAME") if distro != "" { // TODO - //nolint:staticcheck This is untested so until we have coverage I'm not inclined to fix this + //nolint:staticcheck // This is untested so until we have coverage I'm not inclined to fix this distro = strings.TrimLeft(distro, "PRETTY_NAME=") distro = strings.Trim(distro, "\"") return distro From 22652fe7817f020ae8db517353384ecc9adaf3d0 Mon Sep 17 00:00:00 2001 From: Jared Harper Date: Fri, 19 Apr 2024 11:06:46 -0700 Subject: [PATCH 7/9] Remove references to staticcheck --- .github/workflows/test.yaml | 5 ----- CONTRIBUTING.md | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a0055483..0269e781 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -42,8 +42,3 @@ jobs: run: go vet ./... - name: Run tests run: make test - - uses: dominikh/staticcheck-action@v1.2.0 - if: matrix.goversion == '1.20' - with: - install-go: false - cache-key: ${{ matrix.goversion }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff718d62..9cdd218b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,7 +53,7 @@ Run all tests with `make test`. We enforce the following in CI: -* [`staticcheck ./...`](https://staticcheck.dev/docs/) +* [`golangci-lint run`](https://golangci-lint.run/) * [`go vet ./...`](https://pkg.go.dev/cmd/vet) * [`gofmt`](https://pkg.go.dev/cmd/gofmt) From f2962dc4e2ae405a72aa6518456c7fcea7c8707c Mon Sep 17 00:00:00 2001 From: Jared Harper Date: Fri, 19 Apr 2024 11:48:02 -0700 Subject: [PATCH 8/9] only use main branch --- .github/workflows/golangci-lint.yml | 1 - .github/workflows/test.yaml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index b3bad00f..f7a9ca1d 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -2,7 +2,6 @@ name: golangci-lint on: push: branches: - - master - main pull_request: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0269e781..d445c0fa 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -4,7 +4,7 @@ on: pull_request: null push: branches: - - master + - main jobs: license-check: From 8a4ccdc909c88894ad29cd3165f2dd173589ac78 Mon Sep 17 00:00:00 2001 From: Jared Harper Date: Fri, 19 Apr 2024 12:02:26 -0700 Subject: [PATCH 9/9] try to fix go mod files --- examples/grpc/go.mod | 31 +++++++------- examples/grpc/go.sum | 96 ++++++++++++++++++++++---------------------- examples/http/go.mod | 31 +++++++------- examples/http/go.sum | 82 +++++++++++++++++-------------------- 4 files changed, 115 insertions(+), 125 deletions(-) diff --git a/examples/grpc/go.mod b/examples/grpc/go.mod index fdb20fa2..c2500c9a 100644 --- a/examples/grpc/go.mod +++ b/examples/grpc/go.mod @@ -14,7 +14,7 @@ module github.com/solarwinds/apm-go/examples/grpc -go 1.20 +go 1.21 // TODO don't use the local repo replace github.com/solarwinds/apm-go => ../.. @@ -22,31 +22,30 @@ replace github.com/solarwinds/apm-go => ../.. require ( github.com/solarwinds/apm-go v0.1.1 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 - go.opentelemetry.io/otel v1.21.0 - google.golang.org/grpc v1.59.0 - google.golang.org/protobuf v1.31.0 + go.opentelemetry.io/otel v1.25.0 + google.golang.org/grpc v1.63.2 + google.golang.org/protobuf v1.33.0 ) require ( - github.com/aws/aws-sdk-go-v2 v1.23.1 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.5 // indirect - github.com/aws/smithy-go v1.17.0 // indirect + github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect + github.com/aws/smithy-go v1.20.2 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/coocood/freecache v1.2.4 // indirect - github.com/go-logr/logr v1.3.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.4.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/solarwinds/apm-proto v0.0.0-20231107001908-432e697887b6 // indirect - go.opentelemetry.io/otel/metric v1.21.0 // indirect - go.opentelemetry.io/otel/sdk v1.21.0 // indirect - go.opentelemetry.io/otel/trace v1.21.0 // indirect + go.opentelemetry.io/otel/metric v1.25.0 // indirect + go.opentelemetry.io/otel/sdk v1.25.0 // indirect + go.opentelemetry.io/otel/trace v1.25.0 // indirect go.uber.org/atomic v1.11.0 // indirect - golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/net v0.24.0 // indirect + golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/examples/grpc/go.sum b/examples/grpc/go.sum index 909a99ec..db887ff6 100644 --- a/examples/grpc/go.sum +++ b/examples/grpc/go.sum @@ -1,74 +1,73 @@ -cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= +cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= +cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= -github.com/aws/aws-sdk-go-v2 v1.22.2 h1:lV0U8fnhAnPz8YcdmZVV60+tr6CakHzqA6P8T46ExJI= -github.com/aws/aws-sdk-go-v2 v1.22.2/go.mod h1:Kd0OJtkW3Q0M0lUWGszapWjEvrXDzRW+D21JNsroB+c= -github.com/aws/aws-sdk-go-v2 v1.23.1/go.mod h1:i1XDttT4rnf6vxc9AuskLc6s7XBee8rlLilKlc03uAA= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3 h1:G5KawTAkyHH6WyKQCdHiW4h3PmAXNJpOgwKg3H7sDRE= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3/go.mod h1:hugKmSFnZB+HgNI1sYGT14BUPZkO6alC/e0AWu+0IAQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.5/go.mod h1:VhnExhw6uXy9QzetvpXDolo1/hjhx4u9qukBGkuUwjs= -github.com/aws/smithy-go v1.16.0 h1:gJZEH/Fqh+RsvlJ1Zt4tVAtV6bKkp3cC+R6FCZMNzik= -github.com/aws/smithy-go v1.16.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= -github.com/aws/smithy-go v1.17.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= +github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA= +github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 h1:FVJ0r5XTHSmIHJV6KuDmdYhEpvlHpiSd38RQWhut5J4= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1/go.mod h1:zusuAeqezXzAB24LGuzuekqMAEgWkVYukBec3kr3jUg= +github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= +github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= +github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= +github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/coocood/freecache v1.2.4 h1:UdR6Yz/X1HW4fZOuH0Z94KwG851GWOSknua5VUbb/5M= github.com/coocood/freecache v1.2.4/go.mod h1:RBUWa/Cy+OHdfTGFEhEuE1pMCMX51Ncizj7rthiQ3vk= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= +github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/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/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= -github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/solarwinds/apm-proto v0.0.0-20231107001908-432e697887b6 h1:Oyzwjp7RN7X8q3K4iK1B5+XmQL2ou993u9CGXOBkEpk= github.com/solarwinds/apm-proto v0.0.0-20231107001908-432e697887b6/go.mod h1:CN4fCYBnxyOJlBV0CYNXLz6lzNH8SCfNqcCBbpai76c= github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= -go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= -go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs= -go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA= -go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM= -go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= -go.opentelemetry.io/otel/sdk v1.20.0 h1:5Jf6imeFZlZtKv9Qbo6qt2ZkmWtdWx/wzcCbNUlAWGM= -go.opentelemetry.io/otel/sdk v1.20.0/go.mod h1:rmkSx1cZCm/tn16iWDn1GQbLtsW/LvsdEEFzCSRM6V0= -go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= -go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ= -go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU= -go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= +go.opentelemetry.io/otel v1.25.0 h1:gldB5FfhRl7OJQbUHt/8s0a7cE8fbsPAtdpRaApKy4k= +go.opentelemetry.io/otel v1.25.0/go.mod h1:Wa2ds5NOXEMkCmUou1WA7ZBfLTHWIsp034OVD7AO+Vg= +go.opentelemetry.io/otel/metric v1.25.0 h1:LUKbS7ArpFL/I2jJHdJcqMGxkRdxpPHE0VU/D4NuEwA= +go.opentelemetry.io/otel/metric v1.25.0/go.mod h1:rkDLUSd2lC5lq2dFNrX9LGAbINP5B7WBkC78RXCpH5s= +go.opentelemetry.io/otel/sdk v1.25.0 h1:PDryEJPC8YJZQSyLY5eqLeafHtG+X7FWnf3aXMtxbqo= +go.opentelemetry.io/otel/sdk v1.25.0/go.mod h1:oFgzCM2zdsxKzz6zwpTZYLLQsFwc+K0daArPdIhuxkw= +go.opentelemetry.io/otel/trace v1.25.0 h1:tqukZGLwQYRIFtSQM2u2+yfMVTgGVeqRLPUYx1Dq6RM= +go.opentelemetry.io/otel/trace v1.25.0/go.mod h1:hCCs70XM/ljO+BeQkyFnbK28SBIJ/Emuha+ccrCRT7I= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= -golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= -google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= -google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= +google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= @@ -76,3 +75,4 @@ gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3M gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/examples/http/go.mod b/examples/http/go.mod index 58296d83..bc0a007a 100644 --- a/examples/http/go.mod +++ b/examples/http/go.mod @@ -14,7 +14,7 @@ module github.com/solarwinds/apm-go/examples/http -go 1.20 +go 1.21 // TODO don't use the local repo replace github.com/solarwinds/apm-go => ../.. @@ -24,32 +24,31 @@ require ( github.com/mattn/go-sqlite3 v1.14.18 github.com/solarwinds/apm-go v0.1.1 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 - go.opentelemetry.io/otel v1.21.0 - go.opentelemetry.io/otel/trace v1.21.0 + go.opentelemetry.io/otel v1.25.0 + go.opentelemetry.io/otel/trace v1.25.0 ) require ( - github.com/aws/aws-sdk-go-v2 v1.23.1 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.5 // indirect - github.com/aws/smithy-go v1.17.0 // indirect + github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect + github.com/aws/smithy-go v1.20.2 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/coocood/freecache v1.2.4 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/go-logr/logr v1.3.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.4.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/solarwinds/apm-proto v0.0.0-20231107001908-432e697887b6 // indirect - go.opentelemetry.io/otel/metric v1.21.0 // indirect - go.opentelemetry.io/otel/sdk v1.21.0 // indirect + go.opentelemetry.io/otel/metric v1.25.0 // indirect + go.opentelemetry.io/otel/sdk v1.25.0 // indirect go.uber.org/atomic v1.11.0 // indirect - golang.org/x/net v0.18.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/net v0.24.0 // indirect + golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect - google.golang.org/grpc v1.59.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect + google.golang.org/grpc v1.63.2 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/examples/http/go.sum b/examples/http/go.sum index 15aed5cd..79c3b9ed 100644 --- a/examples/http/go.sum +++ b/examples/http/go.sum @@ -1,76 +1,67 @@ github.com/XSAM/otelsql v0.26.0 h1:UhAGVBD34Ctbh2aYcm/JAdL+6T6ybrP+YMWYkHqCdmo= github.com/XSAM/otelsql v0.26.0/go.mod h1:5ciw61eMSh+RtTPN8spvPEPLJpAErZw8mFFPNfYiaxA= -github.com/aws/aws-sdk-go-v2 v1.22.2 h1:lV0U8fnhAnPz8YcdmZVV60+tr6CakHzqA6P8T46ExJI= -github.com/aws/aws-sdk-go-v2 v1.22.2/go.mod h1:Kd0OJtkW3Q0M0lUWGszapWjEvrXDzRW+D21JNsroB+c= -github.com/aws/aws-sdk-go-v2 v1.23.1/go.mod h1:i1XDttT4rnf6vxc9AuskLc6s7XBee8rlLilKlc03uAA= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3 h1:G5KawTAkyHH6WyKQCdHiW4h3PmAXNJpOgwKg3H7sDRE= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.3/go.mod h1:hugKmSFnZB+HgNI1sYGT14BUPZkO6alC/e0AWu+0IAQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.5/go.mod h1:VhnExhw6uXy9QzetvpXDolo1/hjhx4u9qukBGkuUwjs= -github.com/aws/smithy-go v1.16.0 h1:gJZEH/Fqh+RsvlJ1Zt4tVAtV6bKkp3cC+R6FCZMNzik= -github.com/aws/smithy-go v1.16.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= -github.com/aws/smithy-go v1.17.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= +github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA= +github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 h1:FVJ0r5XTHSmIHJV6KuDmdYhEpvlHpiSd38RQWhut5J4= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1/go.mod h1:zusuAeqezXzAB24LGuzuekqMAEgWkVYukBec3kr3jUg= +github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= +github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/coocood/freecache v1.2.4 h1:UdR6Yz/X1HW4fZOuH0Z94KwG851GWOSknua5VUbb/5M= github.com/coocood/freecache v1.2.4/go.mod h1:RBUWa/Cy+OHdfTGFEhEuE1pMCMX51Ncizj7rthiQ3vk= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/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/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= -github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI= github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/solarwinds/apm-proto v0.0.0-20231107001908-432e697887b6 h1:Oyzwjp7RN7X8q3K4iK1B5+XmQL2ou993u9CGXOBkEpk= github.com/solarwinds/apm-proto v0.0.0-20231107001908-432e697887b6/go.mod h1:CN4fCYBnxyOJlBV0CYNXLz6lzNH8SCfNqcCBbpai76c= github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 h1:1eHu3/pUSWaOgltNK3WJFaywKsTIr/PwvHyDmi0lQA0= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0/go.mod h1:HyABWq60Uy1kjJSa2BVOxUVao8Cdick5AWSKPutqy6U= +github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= -go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= -go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs= -go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA= -go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM= -go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= -go.opentelemetry.io/otel/sdk v1.20.0 h1:5Jf6imeFZlZtKv9Qbo6qt2ZkmWtdWx/wzcCbNUlAWGM= -go.opentelemetry.io/otel/sdk v1.20.0/go.mod h1:rmkSx1cZCm/tn16iWDn1GQbLtsW/LvsdEEFzCSRM6V0= -go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= +go.opentelemetry.io/otel v1.25.0 h1:gldB5FfhRl7OJQbUHt/8s0a7cE8fbsPAtdpRaApKy4k= +go.opentelemetry.io/otel v1.25.0/go.mod h1:Wa2ds5NOXEMkCmUou1WA7ZBfLTHWIsp034OVD7AO+Vg= +go.opentelemetry.io/otel/metric v1.25.0 h1:LUKbS7ArpFL/I2jJHdJcqMGxkRdxpPHE0VU/D4NuEwA= +go.opentelemetry.io/otel/metric v1.25.0/go.mod h1:rkDLUSd2lC5lq2dFNrX9LGAbINP5B7WBkC78RXCpH5s= +go.opentelemetry.io/otel/sdk v1.25.0 h1:PDryEJPC8YJZQSyLY5eqLeafHtG+X7FWnf3aXMtxbqo= +go.opentelemetry.io/otel/sdk v1.25.0/go.mod h1:oFgzCM2zdsxKzz6zwpTZYLLQsFwc+K0daArPdIhuxkw= go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k= -go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ= -go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU= -go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= +go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY= +go.opentelemetry.io/otel/trace v1.25.0 h1:tqukZGLwQYRIFtSQM2u2+yfMVTgGVeqRLPUYx1Dq6RM= +go.opentelemetry.io/otel/trace v1.25.0/go.mod h1:hCCs70XM/ljO+BeQkyFnbK28SBIJ/Emuha+ccrCRT7I= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= -google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= -google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= +google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= @@ -78,3 +69,4 @@ gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3M gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=