From 4122c4b3f11885027e6bafa4538352750ef38253 Mon Sep 17 00:00:00 2001 From: Preston Vasquez Date: Fri, 20 Sep 2024 00:05:37 -0600 Subject: [PATCH 1/5] otelmongo: Use a mock deployment for testing against a MongoDB server (#5749) Resolves #39 Use mtest to mock a mongodb deployment. --- .github/workflows/ci.yml | 44 ------- Makefile | 19 +-- .../mongo-driver/mongo/otelmongo/test/go.mod | 1 - .../mongo/otelmongo/test/mongo_test.go | 110 ++++++++++-------- internal/util/testutil.go | 20 ---- tools/wait.sh | 14 --- 6 files changed, 61 insertions(+), 147 deletions(-) delete mode 100644 internal/util/testutil.go diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b9a4ac5819..46f990ff15c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -139,47 +139,3 @@ jobs: echo ${{ needs.compatibility-test.result }} test ${{ needs.compatibility-test.result }} == "success" - integration: - strategy: - matrix: - target: [test-mongo-driver] - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v4 - - name: Install Go - uses: actions/setup-go@v5 - with: - go-version: ${{ env.DEFAULT_GO_VERSION }} - check-latest: true - cache-dependency-path: "**/go.sum" - - name: Run coverage tests ${{ matrix.target }} - env: - INTEGRATION: ${{ matrix.target }} - run: | - make ${{ matrix.target }} - mkdir -p $TEST_RESULTS - find . -name 'coverage.html' > "${TEST_RESULTS}/coverage.lst" - tar -n -cf - -T "${TEST_RESULTS}/coverage.lst" | tar -C "${TEST_RESULTS}" -xvf - - - name: Upload coverage report - uses: codecov/codecov-action@v4.5.0 - if: hashFiles('coverage.out') != '' - with: - file: ./coverage.out - fail_ci_if_error: true - verbose: true - token: ${{ secrets.CODECOV_TOKEN }} - - name: Store coverage test output - uses: actions/upload-artifact@v4 - with: - name: opentelemetry-go-contrib-integration-test-output - path: ${{ env.TEST_RESULTS }} - - test-integration: - runs-on: ubuntu-latest - needs: [integration] - steps: - - name: Test if integration workflow passed - run: | - echo ${{ needs.integration.result }} - test ${{ needs.integration.result }} == "success" diff --git a/Makefile b/Makefile index afc4c388c3f..db1e210e98b 100644 --- a/Makefile +++ b/Makefile @@ -263,23 +263,6 @@ test-coverage/%: && $$CMD ./... \ && $(GO) tool cover -html=coverage.out -o coverage.html; -.PHONY: test-mongo-driver -test-mongo-driver: - @if ./tools/should_build.sh mongo-driver; then \ - set -e; \ - docker run --name mongo-integ --rm -p 27017:27017 -d mongo; \ - CMD=mongo IMG_NAME=mongo-integ ./tools/wait.sh; \ - (cd instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test && \ - $(GO) test \ - -covermode=$(COVERAGE_MODE) \ - -coverprofile=$(COVERAGE_PROFILE) \ - -coverpkg=go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/... \ - ./... \ - && $(GO) tool cover -html=$(COVERAGE_PROFILE) -o coverage.html); \ - cp ./instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/coverage.out ./; \ - docker stop mongo-integ; \ - fi - # Releasing .PHONY: gorelease @@ -351,4 +334,4 @@ genjsonschema: genjsonschema-cleanup $(GOJSONSCHEMA) .PHONY: codespell codespell: $(CODESPELL) - @$(DOCKERPY) $(CODESPELL) \ No newline at end of file + @$(DOCKERPY) $(CODESPELL) diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod index 36abd78d1c7..6fad5c817eb 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod @@ -5,7 +5,6 @@ go 1.22 require ( github.com/stretchr/testify v1.9.0 go.mongodb.org/mongo-driver v1.17.0 - go.opentelemetry.io/contrib v1.30.0 go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.55.0 go.opentelemetry.io/otel v1.30.0 go.opentelemetry.io/otel/sdk v1.30.0 diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/mongo_test.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/mongo_test.go index 21b6eaa97e9..4b0f62b932b 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/mongo_test.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/mongo_test.go @@ -5,17 +5,16 @@ package test import ( "context" - "os" "testing" "time" "github.com/stretchr/testify/assert" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/mongo/integration/mtest" "go.mongodb.org/mongo-driver/mongo/options" "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo" - "go.opentelemetry.io/contrib/internal/util" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" sdktrace "go.opentelemetry.io/otel/sdk/trace" @@ -23,11 +22,6 @@ import ( "go.opentelemetry.io/otel/trace" ) -func TestMain(m *testing.M) { - util.IntegrationShouldRun("test-mongo-driver") - os.Exit(m.Run()) -} - type validator func(sdktrace.ReadOnlySpan) bool func TestDBCrudOperation(t *testing.T) { @@ -49,6 +43,7 @@ func TestDBCrudOperation(t *testing.T) { tt := []struct { title string operation func(context.Context, *mongo.Database) (interface{}, error) + mockResponses []bson.D excludeCommand bool validators []validator }{ @@ -57,6 +52,7 @@ func TestDBCrudOperation(t *testing.T) { operation: func(ctx context.Context, db *mongo.Database) (interface{}, error) { return db.Collection("test-collection").InsertOne(ctx, bson.D{{Key: "test-item", Value: "test-value"}}) }, + mockResponses: []bson.D{{{Key: "ok", Value: 1}}}, excludeCommand: false, validators: append(commonValidators, func(s sdktrace.ReadOnlySpan) bool { for _, attr := range s.Attributes() { @@ -72,6 +68,7 @@ func TestDBCrudOperation(t *testing.T) { operation: func(ctx context.Context, db *mongo.Database) (interface{}, error) { return db.Collection("test-collection").InsertOne(ctx, bson.D{{Key: "test-item", Value: "test-value"}}) }, + mockResponses: []bson.D{{{Key: "ok", Value: 1}}}, excludeCommand: true, validators: append(commonValidators, func(s sdktrace.ReadOnlySpan) bool { for _, attr := range s.Attributes() { @@ -84,13 +81,17 @@ func TestDBCrudOperation(t *testing.T) { }, } for _, tc := range tt { + tc := tc + title := tc.title if tc.excludeCommand { title = title + "/excludeCommand" } else { title = title + "/includeCommand" } - t.Run(title, func(t *testing.T) { + + mt := mtest.New(t, mtest.NewOptions().ClientType(mtest.Mock)) + mt.Run(title, func(mt *mtest.T) { sr := tracetest.NewSpanRecorder() provider := sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) @@ -106,37 +107,36 @@ func TestDBCrudOperation(t *testing.T) { otelmongo.WithCommandAttributeDisabled(tc.excludeCommand), ) opts.ApplyURI(addr) - client, err := mongo.Connect(ctx, opts) - if err != nil { - t.Fatal(err) - } - _, err = tc.operation(ctx, client.Database("test-database")) + mt.ResetClient(opts) + mt.AddMockResponses(tc.mockResponses...) + + _, err := tc.operation(ctx, mt.Client.Database("test-database")) if err != nil { - t.Error(err) + mt.Error(err) } span.End() spans := sr.Ended() - if !assert.Len(t, spans, 2, "expected 2 spans, received %d", len(spans)) { - t.FailNow() + if !assert.Len(mt, spans, 2, "expected 2 spans, received %d", len(spans)) { + mt.FailNow() } - assert.Len(t, spans, 2) - assert.Equal(t, spans[0].SpanContext().TraceID(), spans[1].SpanContext().TraceID()) - assert.Equal(t, spans[0].Parent().SpanID(), spans[1].SpanContext().SpanID()) - assert.Equal(t, span.SpanContext().SpanID(), spans[1].SpanContext().SpanID()) + assert.Len(mt, spans, 2) + assert.Equal(mt, spans[0].SpanContext().TraceID(), spans[1].SpanContext().TraceID()) + assert.Equal(mt, spans[0].Parent().SpanID(), spans[1].SpanContext().SpanID()) + assert.Equal(mt, span.SpanContext().SpanID(), spans[1].SpanContext().SpanID()) s := spans[0] - assert.Equal(t, trace.SpanKindClient, s.SpanKind()) + assert.Equal(mt, trace.SpanKindClient, s.SpanKind()) attrs := s.Attributes() - assert.Contains(t, attrs, attribute.String("db.system", "mongodb")) - assert.Contains(t, attrs, attribute.String("net.peer.name", "localhost")) - assert.Contains(t, attrs, attribute.Int64("net.peer.port", int64(27017))) - assert.Contains(t, attrs, attribute.String("net.transport", "ip_tcp")) - assert.Contains(t, attrs, attribute.String("db.name", "test-database")) + assert.Contains(mt, attrs, attribute.String("db.system", "mongodb")) + assert.Contains(mt, attrs, attribute.String("net.peer.name", "")) + assert.Contains(mt, attrs, attribute.Int64("net.peer.port", int64(27017))) + assert.Contains(mt, attrs, attribute.String("net.transport", "ip_tcp")) + assert.Contains(mt, attrs, attribute.String("db.name", "test-database")) for _, v := range tc.validators { - assert.True(t, v(s)) + assert.True(mt, v(s)) } }) } @@ -144,15 +144,17 @@ func TestDBCrudOperation(t *testing.T) { func TestDBCollectionAttribute(t *testing.T) { tt := []struct { - title string - operation func(context.Context, *mongo.Database) (interface{}, error) - validators []validator + title string + operation func(context.Context, *mongo.Database) (interface{}, error) + mockResponses []bson.D + validators []validator }{ { title: "delete", operation: func(ctx context.Context, db *mongo.Database) (interface{}, error) { return db.Collection("test-collection").DeleteOne(ctx, bson.D{{Key: "test-item"}}) }, + mockResponses: []bson.D{{{Key: "ok", Value: 1}}}, validators: []validator{ func(s sdktrace.ReadOnlySpan) bool { return assert.Equal(t, "test-collection.delete", s.Name()) @@ -173,6 +175,12 @@ func TestDBCollectionAttribute(t *testing.T) { operation: func(ctx context.Context, db *mongo.Database) (interface{}, error) { return db.ListCollectionNames(ctx, bson.D{}) }, + mockResponses: []bson.D{ + { + {Key: "ok", Value: 1}, + {Key: "cursor", Value: bson.D{{Key: "firstBatch", Value: bson.A{}}}}, + }, + }, validators: []validator{ func(s sdktrace.ReadOnlySpan) bool { return assert.Equal(t, "listCollections", s.Name()) @@ -187,7 +195,10 @@ func TestDBCollectionAttribute(t *testing.T) { }, } for _, tc := range tt { - t.Run(tc.title, func(t *testing.T) { + tc := tc + + mt := mtest.New(t, mtest.NewOptions().ClientType(mtest.Mock)) + mt.Run(tc.title, func(mt *mtest.T) { sr := tracetest.NewSpanRecorder() provider := sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr)) @@ -203,37 +214,36 @@ func TestDBCollectionAttribute(t *testing.T) { otelmongo.WithCommandAttributeDisabled(true), ) opts.ApplyURI(addr) - client, err := mongo.Connect(ctx, opts) - if err != nil { - t.Fatal(err) - } - _, err = tc.operation(ctx, client.Database("test-database")) + mt.ResetClient(opts) + mt.AddMockResponses(tc.mockResponses...) + + _, err := tc.operation(ctx, mt.Client.Database("test-database")) if err != nil { - t.Error(err) + mt.Error(err) } span.End() spans := sr.Ended() - if !assert.Len(t, spans, 2, "expected 2 spans, received %d", len(spans)) { - t.FailNow() + if !assert.Len(mt, spans, 2, "expected 2 spans, received %d", len(spans)) { + mt.FailNow() } - assert.Len(t, spans, 2) - assert.Equal(t, spans[0].SpanContext().TraceID(), spans[1].SpanContext().TraceID()) - assert.Equal(t, spans[0].Parent().SpanID(), spans[1].SpanContext().SpanID()) - assert.Equal(t, span.SpanContext().SpanID(), spans[1].SpanContext().SpanID()) + assert.Len(mt, spans, 2) + assert.Equal(mt, spans[0].SpanContext().TraceID(), spans[1].SpanContext().TraceID()) + assert.Equal(mt, spans[0].Parent().SpanID(), spans[1].SpanContext().SpanID()) + assert.Equal(mt, span.SpanContext().SpanID(), spans[1].SpanContext().SpanID()) s := spans[0] - assert.Equal(t, trace.SpanKindClient, s.SpanKind()) + assert.Equal(mt, trace.SpanKindClient, s.SpanKind()) attrs := s.Attributes() - assert.Contains(t, attrs, attribute.String("db.system", "mongodb")) - assert.Contains(t, attrs, attribute.String("net.peer.name", "localhost")) - assert.Contains(t, attrs, attribute.Int64("net.peer.port", int64(27017))) - assert.Contains(t, attrs, attribute.String("net.transport", "ip_tcp")) - assert.Contains(t, attrs, attribute.String("db.name", "test-database")) + assert.Contains(mt, attrs, attribute.String("db.system", "mongodb")) + assert.Contains(mt, attrs, attribute.String("net.peer.name", "")) + assert.Contains(mt, attrs, attribute.Int64("net.peer.port", int64(27017))) + assert.Contains(mt, attrs, attribute.String("net.transport", "ip_tcp")) + assert.Contains(mt, attrs, attribute.String("db.name", "test-database")) for _, v := range tc.validators { - assert.True(t, v(s)) + assert.True(mt, v(s)) } }) } diff --git a/internal/util/testutil.go b/internal/util/testutil.go deleted file mode 100644 index 39e581a7fe4..00000000000 --- a/internal/util/testutil.go +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package util // import "go.opentelemetry.io/contrib/internal/util" - -import ( - "fmt" - "os" -) - -func IntegrationShouldRun(name string) { - if val, ok := os.LookupEnv("INTEGRATION"); !ok || val != name { - fmt.Println( - "--- SKIP: to enable integration test, set the INTEGRATION environment variable", - "to", - fmt.Sprintf("\"%s\"", name), - ) - os.Exit(0) //nolint revive // Signal test was successfully skipped. - } -} diff --git a/tools/wait.sh b/tools/wait.sh index b485027bdf3..8a4d1a5277e 100755 --- a/tools/wait.sh +++ b/tools/wait.sh @@ -15,18 +15,6 @@ wait_for_cassandra () { exit 1 } -wait_for_mongo () { - for ((i = 0; i < 5; ++i)); do - if docker exec "$1" mongosh; then - exit 0 - fi - echo "Mongo not yet available..." - sleep 10 - done - echo "Timeout waiting for mongo to initialize" - exit 1 -} - wait_for_gomemcache () { for ((i = 0; i < 5; ++i)); do if nc -z localhost 11211; then @@ -49,8 +37,6 @@ fi if [ "$CMD" == "cassandra" ]; then wait_for_cassandra "$IMG_NAME" -elif [ "$CMD" == "mongo" ]; then - wait_for_mongo "$IMG_NAME" elif [ "$CMD" == "gomemcache" ]; then wait_for_gomemcache else From f8f096e1d03765aa7f872ebf675a7a8f71371610 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 09:30:42 +0200 Subject: [PATCH 2/5] fix(deps): update module github.com/aws/smithy-go to v1.21.0 (#6129) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/aws/smithy-go](https://redirect.github.com/aws/smithy-go) | `v1.20.4` -> `v1.21.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2faws%2fsmithy-go/v1.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2faws%2fsmithy-go/v1.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2faws%2fsmithy-go/v1.20.4/v1.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2faws%2fsmithy-go/v1.20.4/v1.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
aws/smithy-go (github.com/aws/smithy-go) ### [`v1.21.0`](https://redirect.github.com/aws/smithy-go/compare/v1.20.4...v1.21.0) [Compare Source](https://redirect.github.com/aws/smithy-go/compare/v1.20.4...v1.21.0)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-go-contrib). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .../github.com/aws/aws-lambda-go/otellambda/example/go.mod | 2 +- .../github.com/aws/aws-lambda-go/otellambda/example/go.sum | 4 ++-- .../github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod | 2 +- .../github.com/aws/aws-sdk-go-v2/otelaws/example/go.sum | 4 ++-- instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.mod | 2 +- instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.sum | 4 ++-- .../github.com/aws/aws-sdk-go-v2/otelaws/test/go.mod | 2 +- .../github.com/aws/aws-sdk-go-v2/otelaws/test/go.sum | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod index b0cf4412ae4..8851c1c22d7 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod @@ -41,7 +41,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sso v1.22.8 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.30.8 // indirect - github.com/aws/smithy-go v1.20.4 // indirect + github.com/aws/smithy-go v1.21.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum index 87fa9ea87e6..47e4c4e3c1d 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.sum @@ -40,8 +40,8 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8 h1:+HpGETD9463PFSj7lX5+eq7a github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8/go.mod h1:bCbAxKDqNvkHxRaIMnyVPXPo+OaPRwvmgzMxbz1VKSA= github.com/aws/aws-sdk-go-v2/service/sts v1.30.8 h1:bAi+4p5EKnni+jrfcAhb7iHFQ24bthOAV9t0taf3DCE= github.com/aws/aws-sdk-go-v2/service/sts v1.30.8/go.mod h1:NXi1dIAGteSaRLqYgarlhP/Ij0cFT+qmCwiJqWh/U5o= -github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= -github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= +github.com/aws/smithy-go v1.21.0 h1:H7L8dtDRk0P1Qm6y0ji7MCYMQObJ5R9CRpyPhRUkLYA= +github.com/aws/smithy-go v1.21.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod index f12db4dc501..315b5fd539b 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod @@ -33,7 +33,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sso v1.22.8 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.30.8 // indirect - github.com/aws/smithy-go v1.20.4 // indirect + github.com/aws/smithy-go v1.21.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/google/uuid v1.6.0 // indirect diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.sum b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.sum index 952354e51c2..897be0f21b2 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.sum +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.sum @@ -38,8 +38,8 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8 h1:+HpGETD9463PFSj7lX5+eq7a github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8/go.mod h1:bCbAxKDqNvkHxRaIMnyVPXPo+OaPRwvmgzMxbz1VKSA= github.com/aws/aws-sdk-go-v2/service/sts v1.30.8 h1:bAi+4p5EKnni+jrfcAhb7iHFQ24bthOAV9t0taf3DCE= github.com/aws/aws-sdk-go-v2/service/sts v1.30.8/go.mod h1:NXi1dIAGteSaRLqYgarlhP/Ij0cFT+qmCwiJqWh/U5o= -github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= -github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= +github.com/aws/smithy-go v1.21.0 h1:H7L8dtDRk0P1Qm6y0ji7MCYMQObJ5R9CRpyPhRUkLYA= +github.com/aws/smithy-go v1.21.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.mod b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.mod index 3e945eaf698..b3bfa707271 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.mod +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go-v2 v1.30.5 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.10 github.com/aws/aws-sdk-go-v2/service/sqs v1.34.9 - github.com/aws/smithy-go v1.20.4 + github.com/aws/smithy-go v1.21.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/otel v1.30.0 go.opentelemetry.io/otel/trace v1.30.0 diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.sum b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.sum index 34c66f1a518..812243a732a 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.sum +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.sum @@ -12,8 +12,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.18 h1:GACd github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.18/go.mod h1:K+xV06+Wni4TSaOOJ1Y35e5tYOCUBYbebLKmJQQa8yY= github.com/aws/aws-sdk-go-v2/service/sqs v1.34.9 h1:soISVWbRSqWplczJaEYxj26UrGULnptybx/eA3aGo90= github.com/aws/aws-sdk-go-v2/service/sqs v1.34.9/go.mod h1:zn0Oy7oNni7XIGoAd6bHBTVtX06OrnpvT1kww8jxyi8= -github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= -github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= +github.com/aws/smithy-go v1.21.0 h1:H7L8dtDRk0P1Qm6y0ji7MCYMQObJ5R9CRpyPhRUkLYA= +github.com/aws/smithy-go v1.21.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.mod b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.mod index 9e148b9f2da..3cb7907102a 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.mod +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go-v2 v1.30.5 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.10 github.com/aws/aws-sdk-go-v2/service/route53 v1.43.3 - github.com/aws/smithy-go v1.20.4 + github.com/aws/smithy-go v1.21.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.55.0 go.opentelemetry.io/otel v1.30.0 diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.sum b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.sum index 2235464453a..0b730a1bf49 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.sum +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.sum @@ -14,8 +14,8 @@ github.com/aws/aws-sdk-go-v2/service/route53 v1.43.3 h1:hMnlDw1V8y9dKmWxxw3CqMCw github.com/aws/aws-sdk-go-v2/service/route53 v1.43.3/go.mod h1:343vcjcyOTuHTBBgUrOxPM36/jE96qLZnGL447ldrB0= github.com/aws/aws-sdk-go-v2/service/sqs v1.34.9 h1:soISVWbRSqWplczJaEYxj26UrGULnptybx/eA3aGo90= github.com/aws/aws-sdk-go-v2/service/sqs v1.34.9/go.mod h1:zn0Oy7oNni7XIGoAd6bHBTVtX06OrnpvT1kww8jxyi8= -github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= -github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= +github.com/aws/smithy-go v1.21.0 h1:H7L8dtDRk0P1Qm6y0ji7MCYMQObJ5R9CRpyPhRUkLYA= +github.com/aws/smithy-go v1.21.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= From b12f235dec8eb2e7262af73f8205ac4e4e304fdc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 09:43:40 +0200 Subject: [PATCH 3/5] fix(deps): update module google.golang.org/grpc to v1.67.0 (#6131) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google.golang.org/grpc](https://redirect.github.com/grpc/grpc-go) | `v1.66.2` -> `v1.67.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/google.golang.org%2fgrpc/v1.67.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/google.golang.org%2fgrpc/v1.67.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/google.golang.org%2fgrpc/v1.66.2/v1.67.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/google.golang.org%2fgrpc/v1.66.2/v1.67.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
grpc/grpc-go (google.golang.org/grpc) ### [`v1.67.0`](https://redirect.github.com/grpc/grpc-go/compare/v1.66.2...v1.67.0) [Compare Source](https://redirect.github.com/grpc/grpc-go/compare/v1.66.2...v1.67.0)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-go-contrib). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- config/go.mod | 2 +- config/go.sum | 4 ++-- exporters/autoexport/go.mod | 2 +- exporters/autoexport/go.sum | 4 ++-- .../github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod | 2 +- .../github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.sum | 4 ++-- .../google.golang.org/grpc/otelgrpc/example/go.mod | 2 +- .../google.golang.org/grpc/otelgrpc/example/go.sum | 4 ++-- instrumentation/google.golang.org/grpc/otelgrpc/go.mod | 2 +- instrumentation/google.golang.org/grpc/otelgrpc/go.sum | 4 ++-- instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod | 2 +- instrumentation/google.golang.org/grpc/otelgrpc/test/go.sum | 4 ++-- propagators/opencensus/examples/go.mod | 2 +- propagators/opencensus/examples/go.sum | 4 ++-- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/config/go.mod b/config/go.mod index 43bea0db8a3..0a6067992b0 100644 --- a/config/go.mod +++ b/config/go.mod @@ -45,7 +45,7 @@ require ( golang.org/x/text v0.18.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/grpc v1.66.2 // indirect + google.golang.org/grpc v1.67.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/config/go.sum b/config/go.sum index ddd92efefe9..ed04f6f150a 100644 --- a/config/go.sum +++ b/config/go.sum @@ -89,8 +89,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1: google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= -google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= +google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/exporters/autoexport/go.mod b/exporters/autoexport/go.mod index 2ef678b3fc9..39e2738b363 100644 --- a/exporters/autoexport/go.mod +++ b/exporters/autoexport/go.mod @@ -49,7 +49,7 @@ require ( golang.org/x/text v0.18.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/grpc v1.66.2 // indirect + google.golang.org/grpc v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporters/autoexport/go.sum b/exporters/autoexport/go.sum index c52001dcc26..48944d4cd0b 100644 --- a/exporters/autoexport/go.sum +++ b/exporters/autoexport/go.sum @@ -91,8 +91,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1: google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= -google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= +google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod index 1bc6b05b407..c53f8f5bbd7 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod @@ -19,7 +19,7 @@ require ( go.opentelemetry.io/otel/sdk v1.30.0 go.opentelemetry.io/otel/trace v1.30.0 go.opentelemetry.io/proto/otlp v1.3.1 - google.golang.org/grpc v1.66.2 + google.golang.org/grpc v1.67.0 ) require ( diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.sum b/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.sum index 7e0cec9c5bf..29a138ea9b6 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.sum +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.sum @@ -51,8 +51,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1: google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= -google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= +google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod index 8f3beacc523..f134a57b855 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod +++ b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod @@ -12,7 +12,7 @@ require ( go.opentelemetry.io/otel/sdk v1.30.0 go.opentelemetry.io/otel/trace v1.30.0 golang.org/x/net v0.29.0 - google.golang.org/grpc v1.66.2 + google.golang.org/grpc v1.67.0 ) require ( diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.sum b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.sum index 1bbdfbcdfa7..8b0818d3c10 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.sum +++ b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.sum @@ -33,8 +33,8 @@ golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= -google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= +google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/go.mod b/instrumentation/google.golang.org/grpc/otelgrpc/go.mod index e24a5c08172..ce4901d61c7 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/go.mod +++ b/instrumentation/google.golang.org/grpc/otelgrpc/go.mod @@ -7,7 +7,7 @@ require ( go.opentelemetry.io/otel v1.30.0 go.opentelemetry.io/otel/metric v1.30.0 go.opentelemetry.io/otel/trace v1.30.0 - google.golang.org/grpc v1.66.2 + google.golang.org/grpc v1.67.0 google.golang.org/protobuf v1.34.2 ) diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/go.sum b/instrumentation/google.golang.org/grpc/otelgrpc/go.sum index bc95bfbaf01..6640f13215c 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/go.sum +++ b/instrumentation/google.golang.org/grpc/otelgrpc/go.sum @@ -25,8 +25,8 @@ golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= -google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= +google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod b/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod index ba0dd75a4b7..d8959f8b2db 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod +++ b/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod @@ -10,7 +10,7 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.30.0 go.opentelemetry.io/otel/trace v1.30.0 go.uber.org/goleak v1.3.0 - google.golang.org/grpc v1.66.2 + google.golang.org/grpc v1.67.0 ) require ( diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/test/go.sum b/instrumentation/google.golang.org/grpc/otelgrpc/test/go.sum index e46efade555..74f40e30f24 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/test/go.sum +++ b/instrumentation/google.golang.org/grpc/otelgrpc/test/go.sum @@ -38,8 +38,8 @@ golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= -google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= +google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/propagators/opencensus/examples/go.mod b/propagators/opencensus/examples/go.mod index 6071dd30649..ad12089ee04 100644 --- a/propagators/opencensus/examples/go.mod +++ b/propagators/opencensus/examples/go.mod @@ -9,7 +9,7 @@ require ( go.opentelemetry.io/otel v1.30.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.30.0 go.opentelemetry.io/otel/sdk v1.30.0 - google.golang.org/grpc v1.66.2 + google.golang.org/grpc v1.67.0 ) require ( diff --git a/propagators/opencensus/examples/go.sum b/propagators/opencensus/examples/go.sum index 83ec4718cc5..9264b79fae4 100644 --- a/propagators/opencensus/examples/go.sum +++ b/propagators/opencensus/examples/go.sum @@ -115,8 +115,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= -google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= +google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From b077d795ca6c20496629472a19cc18cddf5f2998 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 09:55:14 +0200 Subject: [PATCH 4/5] fix(deps): update opentelemetry-go monorepo to a200e0a (#6130) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [go.opentelemetry.io/otel/log](https://redirect.github.com/open-telemetry/opentelemetry-go) | require | digest | `7bd1c85` -> `a200e0a` | | [go.opentelemetry.io/otel/sdk/log](https://redirect.github.com/open-telemetry/opentelemetry-go) | require | digest | `7bd1c85` -> `a200e0a` | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-go-contrib). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- bridges/otellogr/go.mod | 2 +- bridges/otellogr/go.sum | 4 ++-- bridges/otellogrus/go.mod | 2 +- bridges/otellogrus/go.sum | 4 ++-- bridges/otelslog/go.mod | 2 +- bridges/otelslog/go.sum | 4 ++-- bridges/otelzap/go.mod | 2 +- bridges/otelzap/go.sum | 4 ++-- processors/minsev/go.mod | 4 ++-- processors/minsev/go.sum | 8 ++++---- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bridges/otellogr/go.mod b/bridges/otellogr/go.mod index f37ba08bd7b..392ef4dfec5 100644 --- a/bridges/otellogr/go.mod +++ b/bridges/otellogr/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/go-logr/logr v1.4.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905 + go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a ) require ( diff --git a/bridges/otellogr/go.sum b/bridges/otellogr/go.sum index 3abd071fcae..091e15d48e2 100644 --- a/bridges/otellogr/go.sum +++ b/bridges/otellogr/go.sum @@ -13,8 +13,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc= -go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905 h1:w5NKAj+i6l2LP7b6h2iHIWFeSk3NuC4Z1jOp1KClzQw= -go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905/go.mod h1:KdySypjQHhP069JX0z/t26VHwa8vSwzgaKmXtIB3fJM= +go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a h1:8a5b0oPqgPMXNXW22ftEsRId3EgepIZBaMVqEhAjJEc= +go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a/go.mod h1:KdySypjQHhP069JX0z/t26VHwa8vSwzgaKmXtIB3fJM= go.opentelemetry.io/otel/metric v1.30.0 h1:4xNulvn9gjzo4hjg+wzIKG7iNFEaBMX00Qd4QIZs7+w= go.opentelemetry.io/otel/metric v1.30.0/go.mod h1:aXTfST94tswhWEb+5QjlSqG+cZlmyXy/u8jFpor3WqQ= go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc= diff --git a/bridges/otellogrus/go.mod b/bridges/otellogrus/go.mod index cf34f5ec030..da6397b0f8b 100644 --- a/bridges/otellogrus/go.mod +++ b/bridges/otellogrus/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905 + go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a ) require ( diff --git a/bridges/otellogrus/go.sum b/bridges/otellogrus/go.sum index 5d0d3fbe150..034bc734059 100644 --- a/bridges/otellogrus/go.sum +++ b/bridges/otellogrus/go.sum @@ -18,8 +18,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc= -go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905 h1:w5NKAj+i6l2LP7b6h2iHIWFeSk3NuC4Z1jOp1KClzQw= -go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905/go.mod h1:KdySypjQHhP069JX0z/t26VHwa8vSwzgaKmXtIB3fJM= +go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a h1:8a5b0oPqgPMXNXW22ftEsRId3EgepIZBaMVqEhAjJEc= +go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a/go.mod h1:KdySypjQHhP069JX0z/t26VHwa8vSwzgaKmXtIB3fJM= go.opentelemetry.io/otel/metric v1.30.0 h1:4xNulvn9gjzo4hjg+wzIKG7iNFEaBMX00Qd4QIZs7+w= go.opentelemetry.io/otel/metric v1.30.0/go.mod h1:aXTfST94tswhWEb+5QjlSqG+cZlmyXy/u8jFpor3WqQ= go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc= diff --git a/bridges/otelslog/go.mod b/bridges/otelslog/go.mod index 32c58097bcc..57d8e52843c 100644 --- a/bridges/otelslog/go.mod +++ b/bridges/otelslog/go.mod @@ -4,7 +4,7 @@ go 1.22 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905 + go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a ) require ( diff --git a/bridges/otelslog/go.sum b/bridges/otelslog/go.sum index 3abd071fcae..091e15d48e2 100644 --- a/bridges/otelslog/go.sum +++ b/bridges/otelslog/go.sum @@ -13,8 +13,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc= -go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905 h1:w5NKAj+i6l2LP7b6h2iHIWFeSk3NuC4Z1jOp1KClzQw= -go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905/go.mod h1:KdySypjQHhP069JX0z/t26VHwa8vSwzgaKmXtIB3fJM= +go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a h1:8a5b0oPqgPMXNXW22ftEsRId3EgepIZBaMVqEhAjJEc= +go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a/go.mod h1:KdySypjQHhP069JX0z/t26VHwa8vSwzgaKmXtIB3fJM= go.opentelemetry.io/otel/metric v1.30.0 h1:4xNulvn9gjzo4hjg+wzIKG7iNFEaBMX00Qd4QIZs7+w= go.opentelemetry.io/otel/metric v1.30.0/go.mod h1:aXTfST94tswhWEb+5QjlSqG+cZlmyXy/u8jFpor3WqQ= go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc= diff --git a/bridges/otelzap/go.mod b/bridges/otelzap/go.mod index fb8336724c9..c03ed5d5187 100644 --- a/bridges/otelzap/go.mod +++ b/bridges/otelzap/go.mod @@ -4,7 +4,7 @@ go 1.22 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905 + go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a go.uber.org/zap v1.27.0 ) diff --git a/bridges/otelzap/go.sum b/bridges/otelzap/go.sum index 8b39ab55ad0..53deff685d6 100644 --- a/bridges/otelzap/go.sum +++ b/bridges/otelzap/go.sum @@ -13,8 +13,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc= -go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905 h1:w5NKAj+i6l2LP7b6h2iHIWFeSk3NuC4Z1jOp1KClzQw= -go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905/go.mod h1:KdySypjQHhP069JX0z/t26VHwa8vSwzgaKmXtIB3fJM= +go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a h1:8a5b0oPqgPMXNXW22ftEsRId3EgepIZBaMVqEhAjJEc= +go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a/go.mod h1:KdySypjQHhP069JX0z/t26VHwa8vSwzgaKmXtIB3fJM= go.opentelemetry.io/otel/metric v1.30.0 h1:4xNulvn9gjzo4hjg+wzIKG7iNFEaBMX00Qd4QIZs7+w= go.opentelemetry.io/otel/metric v1.30.0/go.mod h1:aXTfST94tswhWEb+5QjlSqG+cZlmyXy/u8jFpor3WqQ= go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc= diff --git a/processors/minsev/go.mod b/processors/minsev/go.mod index 52414184f8a..0d7e2b8c9ad 100644 --- a/processors/minsev/go.mod +++ b/processors/minsev/go.mod @@ -4,8 +4,8 @@ go 1.22 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905 - go.opentelemetry.io/otel/sdk/log v0.6.1-0.20240918061713-7bd1c85f9905 + go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a + go.opentelemetry.io/otel/sdk/log v0.6.1-0.20240920073023-a200e0a2c68a ) require ( diff --git a/processors/minsev/go.sum b/processors/minsev/go.sum index b11284ea730..3814bcef5fa 100644 --- a/processors/minsev/go.sum +++ b/processors/minsev/go.sum @@ -15,14 +15,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc= -go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905 h1:w5NKAj+i6l2LP7b6h2iHIWFeSk3NuC4Z1jOp1KClzQw= -go.opentelemetry.io/otel/log v0.6.1-0.20240918061713-7bd1c85f9905/go.mod h1:KdySypjQHhP069JX0z/t26VHwa8vSwzgaKmXtIB3fJM= +go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a h1:8a5b0oPqgPMXNXW22ftEsRId3EgepIZBaMVqEhAjJEc= +go.opentelemetry.io/otel/log v0.6.1-0.20240920073023-a200e0a2c68a/go.mod h1:KdySypjQHhP069JX0z/t26VHwa8vSwzgaKmXtIB3fJM= go.opentelemetry.io/otel/metric v1.30.0 h1:4xNulvn9gjzo4hjg+wzIKG7iNFEaBMX00Qd4QIZs7+w= go.opentelemetry.io/otel/metric v1.30.0/go.mod h1:aXTfST94tswhWEb+5QjlSqG+cZlmyXy/u8jFpor3WqQ= go.opentelemetry.io/otel/sdk v1.30.0 h1:cHdik6irO49R5IysVhdn8oaiR9m8XluDaJAs4DfOrYE= go.opentelemetry.io/otel/sdk v1.30.0/go.mod h1:p14X4Ok8S+sygzblytT1nqG98QG2KYKv++HE0LY/mhg= -go.opentelemetry.io/otel/sdk/log v0.6.1-0.20240918061713-7bd1c85f9905 h1:J2Uxc5zGxGNgjEAwY8ExZai1MRqh34dSPOqMr4n+r/Q= -go.opentelemetry.io/otel/sdk/log v0.6.1-0.20240918061713-7bd1c85f9905/go.mod h1:L1DN8RMAduKkrwRAFDEX3E3TLOq46+XMGSbUfHU/+vE= +go.opentelemetry.io/otel/sdk/log v0.6.1-0.20240920073023-a200e0a2c68a h1:J1RrOoljSDHEE1dFl4FfnA4wFSejyRKIhPFYctFIipY= +go.opentelemetry.io/otel/sdk/log v0.6.1-0.20240920073023-a200e0a2c68a/go.mod h1:L1DN8RMAduKkrwRAFDEX3E3TLOq46+XMGSbUfHU/+vE= go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc= go.opentelemetry.io/otel/trace v1.30.0/go.mod h1:5EyKqTzzmyqB9bwtCCq6pDLktPK6fmGf/Dph+8VI02o= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= From d295ae36401fedd19ae85ba618ff337c5809c9b5 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Fri, 20 Sep 2024 10:25:56 +0200 Subject: [PATCH 5/5] [chore]: enable len and empty rules from testifylint (#6125) #### Description Testifylint is a linter that provides best practices with the use of testify. This PR enables [empty](https://github.com/Antonboom/testifylint?tab=readme-ov-file#empty) and [len](https://github.com/Antonboom/testifylint?tab=readme-ov-file#len) rules from [testifylint](https://github.com/Antonboom/testifylint) It's linter provided by golangci-lint. Here all available rules are activated except those who require to be fixed. This PR only fixes empty and len so the quantity of changes stays reasonnable for reviewers. --------- Signed-off-by: Matthieu MOREL Co-authored-by: Damien Mathieu <42@dmathieu.com> --- .golangci.yml | 14 ++++++++++++++ detectors/aws/ecs/ecs_test.go | 2 +- detectors/aws/lambda/detector_test.go | 2 +- instrgen/driver/instrgen_test.go | 4 ++-- .../aws/aws-lambda-go/otellambda/lambda_test.go | 4 ++-- .../go-restful/otelrestful/restful_test.go | 2 +- .../gin-gonic/gin/otelgin/test/gintrace_test.go | 4 ++-- .../gorilla/mux/otelmux/test/mux_test.go | 2 +- .../grpc/otelgrpc/test/grpc_stats_handler_test.go | 8 ++++---- .../otelhttptrace/test/clienttrace_test.go | 6 +++--- .../net/http/otelhttp/test/client_test.go | 4 ++-- .../net/http/otelhttp/test/handler_test.go | 2 +- processors/minsev/minsev_test.go | 6 +++--- samplers/aws/xray/internal/manifest_test.go | 4 ++-- samplers/probability/consistent/sampler_test.go | 4 ++-- .../probability/consistent/statistical_test.go | 2 +- zpages/bucket_test.go | 2 +- zpages/spanprocessor_test.go | 12 ++++++------ 18 files changed, 49 insertions(+), 35 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index a5a1faa4dc1..14cebf3c101 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -26,6 +26,7 @@ linters: - revive - staticcheck - tenv + - testifylint - typecheck - unconvert - unparam @@ -243,3 +244,16 @@ linters-settings: # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#waitgroup-by-value - name: waitgroup-by-value disabled: false + testifylint: + enable-all: true + disable: + - compares + - error-is-as + - error-nil + - expected-actual + - float-compare + - formatter + - go-require + - negative-positive + - nil-compare + - require-error diff --git a/detectors/aws/ecs/ecs_test.go b/detectors/aws/ecs/ecs_test.go index 12c9a801372..09cb1461654 100644 --- a/detectors/aws/ecs/ecs_test.go +++ b/detectors/aws/ecs/ecs_test.go @@ -187,7 +187,7 @@ func TestDetectCannotReadContainerName(t *testing.T) { res, err := detector.Detect(context.Background()) assert.Equal(t, errCannotReadContainerName, err) - assert.Equal(t, 0, len(res.Attributes())) + assert.Empty(t, res.Attributes()) } // returns empty resource when process is not running ECS. diff --git a/detectors/aws/lambda/detector_test.go b/detectors/aws/lambda/detector_test.go index ebaacecf635..33b6a8ee576 100644 --- a/detectors/aws/lambda/detector_test.go +++ b/detectors/aws/lambda/detector_test.go @@ -46,5 +46,5 @@ func TestReturnsIfNoEnvVars(t *testing.T) { res, err := detector.Detect(context.Background()) assert.Equal(t, errNotOnLambda, err) - assert.Equal(t, 0, len(res.Attributes())) + assert.Empty(t, res.Attributes()) } diff --git a/instrgen/driver/instrgen_test.go b/instrgen/driver/instrgen_test.go index 8818441ec36..3871eb06e39 100644 --- a/instrgen/driver/instrgen_test.go +++ b/instrgen/driver/instrgen_test.go @@ -47,10 +47,10 @@ func TestCommands(t *testing.T) { func TestCallGraph(t *testing.T) { cg := makeCallGraph("./testdata/dummy", "./...") dumpCallGraph(cg) - assert.Equal(t, len(cg), 0, "callgraph should contain 0 elems") + assert.Empty(t, cg, "callgraph should contain 0 elems") rf := makeRootFunctions("./testdata/dummy", "./...") dumpRootFunctions(rf) - assert.Equal(t, len(rf), 0, "rootfunctions set should be empty") + assert.Empty(t, rf, "rootfunctions set should be empty") } func TestArgs(t *testing.T) { diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/lambda_test.go b/instrumentation/github.com/aws/aws-lambda-go/otellambda/lambda_test.go index fd7279e608c..256cf7a2d4e 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/lambda_test.go +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/lambda_test.go @@ -124,7 +124,7 @@ func TestLambdaHandlerSignatures(t *testing.T) { lambdaHandler := InstrumentHandler(testCase.handler) handler := reflect.ValueOf(lambdaHandler) resp := handler.Call(testCase.args) - assert.Equal(t, 2, len(resp)) + assert.Len(t, resp, 2) assert.Equal(t, testCase.expected, resp[1].Interface()) }) } @@ -228,7 +228,7 @@ func TestHandlerInvokes(t *testing.T) { args = append(args, reflect.ValueOf(testCase.input)) } response := handler.Call(args) - assert.Equal(t, 2, len(response)) + assert.Len(t, response, 2) if testCase.expected.err != nil { assert.Equal(t, testCase.expected.err, response[handlerType.NumOut()-1].Interface()) } else { diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/restful_test.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/restful_test.go index 53038955d7d..0ae6b1fe688 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/restful_test.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/restful_test.go @@ -209,7 +209,7 @@ func TestWithPublicEndpointFn(t *testing.T) { }, spansAssert: func(t *testing.T, _ oteltrace.SpanContext, spans []sdktrace.ReadOnlySpan) { require.Len(t, spans, 1) - require.Len(t, spans[0].Links(), 0, "should not contain link") + require.Empty(t, spans[0].Links(), "should not contain link") }, }, } { diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/test/gintrace_test.go b/instrumentation/github.com/gin-gonic/gin/otelgin/test/gintrace_test.go index d90ac7ec9c0..6af02d2cbd2 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/test/gintrace_test.go +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/test/gintrace_test.go @@ -268,7 +268,7 @@ func TestWithFilter(t *testing.T) { w := httptest.NewRecorder() router.ServeHTTP(w, r) - assert.Len(t, sr.Ended(), 0) + assert.Empty(t, sr.Ended()) }) t.Run("custom filter not filtering route", func(t *testing.T) { @@ -302,7 +302,7 @@ func TestWithGinFilter(t *testing.T) { w := httptest.NewRecorder() router.ServeHTTP(w, r) - assert.Len(t, sr.Ended(), 0) + assert.Empty(t, sr.Ended()) }) t.Run("custom filter not filtering route", func(t *testing.T) { diff --git a/instrumentation/github.com/gorilla/mux/otelmux/test/mux_test.go b/instrumentation/github.com/gorilla/mux/otelmux/test/mux_test.go index d5e489b2eb6..8f370ce59ba 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/test/mux_test.go +++ b/instrumentation/github.com/gorilla/mux/otelmux/test/mux_test.go @@ -243,7 +243,7 @@ func TestWithPublicEndpointFn(t *testing.T) { }, spansAssert: func(t *testing.T, _ trace.SpanContext, spans []sdktrace.ReadOnlySpan) { require.Len(t, spans, 1) - require.Len(t, spans[0].Links(), 0, "should not contain link") + require.Empty(t, spans[0].Links(), "should not contain link") }, }, } diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/test/grpc_stats_handler_test.go b/instrumentation/google.golang.org/grpc/otelgrpc/test/grpc_stats_handler_test.go index 948d42a48a2..75b867e2eb3 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/test/grpc_stats_handler_test.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/test/grpc_stats_handler_test.go @@ -115,25 +115,25 @@ func TestStatsHandler(t *testing.T) { }) } else { t.Run("ClientSpans", func(t *testing.T) { - require.Len(t, clientSR.Ended(), 0) + require.Empty(t, clientSR.Ended()) }) t.Run("ClientMetrics", func(t *testing.T) { rm := metricdata.ResourceMetrics{} err := clientMetricReader.Collect(context.Background(), &rm) assert.NoError(t, err) - require.Len(t, rm.ScopeMetrics, 0) + require.Empty(t, rm.ScopeMetrics) }) t.Run("ServerSpans", func(t *testing.T) { - require.Len(t, serverSR.Ended(), 0) + require.Empty(t, serverSR.Ended()) }) t.Run("ServerMetrics", func(t *testing.T) { rm := metricdata.ResourceMetrics{} err := serverMetricReader.Collect(context.Background(), &rm) assert.NoError(t, err) - require.Len(t, rm.ScopeMetrics, 0) + require.Empty(t, rm.ScopeMetrics) }) } }) diff --git a/instrumentation/net/http/httptrace/otelhttptrace/test/clienttrace_test.go b/instrumentation/net/http/httptrace/otelhttptrace/test/clienttrace_test.go index 685ea49ec7c..96f7888f68a 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/test/clienttrace_test.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/test/clienttrace_test.go @@ -263,7 +263,7 @@ func TestEndBeforeStartWithoutSubSpansDoesNotPanic(t *testing.T) { // no spans created because we were just using background context without span // and Start wasn't called which would have started a span - require.Len(t, sr.Ended(), 0) + require.Empty(t, sr.Ended()) } type clientTraceTestFixture struct { @@ -306,7 +306,7 @@ func TestWithoutSubSpans(t *testing.T) { require.NoError(t, err) require.NoError(t, resp.Body.Close()) // no spans created because we were just using background context without span - require.Len(t, fixture.SpanRecorder.Ended(), 0) + require.Empty(t, fixture.SpanRecorder.Ended()) // Start again with a "real" span in the context, now tracing should add // events and annotations. @@ -443,7 +443,7 @@ func TestWithoutHeaders(t *testing.T) { recSpan := fixture.SpanRecorder.Ended()[0] gotAttributes := recSpan.Attributes() - require.Len(t, gotAttributes, 0) + require.Empty(t, gotAttributes) } func TestWithInsecureHeaders(t *testing.T) { diff --git a/instrumentation/net/http/otelhttp/test/client_test.go b/instrumentation/net/http/otelhttp/test/client_test.go index 424e0ab2ef8..04516326a28 100644 --- a/instrumentation/net/http/otelhttp/test/client_test.go +++ b/instrumentation/net/http/otelhttp/test/client_test.go @@ -68,7 +68,7 @@ func TestConvenienceWrappers(t *testing.T) { res.Body.Close() spans := sr.Ended() - require.Equal(t, 4, len(spans)) + require.Len(t, spans, 4) assert.Equal(t, "HTTP GET", spans[0].Name()) assert.Equal(t, "HTTP HEAD", spans[1].Name()) assert.Equal(t, "HTTP POST", spans[2].Name()) @@ -100,7 +100,7 @@ func TestClientWithTraceContext(t *testing.T) { span.End() spans := sr.Ended() - require.Equal(t, 2, len(spans)) + require.Len(t, spans, 2) assert.Equal(t, "HTTP GET", spans[0].Name()) assert.Equal(t, "http requests", spans[1].Name()) assert.NotEmpty(t, spans[0].Parent().SpanID()) diff --git a/instrumentation/net/http/otelhttp/test/handler_test.go b/instrumentation/net/http/otelhttp/test/handler_test.go index 831db4c0a85..57e5544783d 100644 --- a/instrumentation/net/http/otelhttp/test/handler_test.go +++ b/instrumentation/net/http/otelhttp/test/handler_test.go @@ -432,7 +432,7 @@ func TestWithPublicEndpointFn(t *testing.T) { }, spansAssert: func(t *testing.T, _ trace.SpanContext, spans []sdktrace.ReadOnlySpan) { require.Len(t, spans, 1) - require.Len(t, spans[0].Links(), 0, "should not contain link") + require.Empty(t, spans[0].Links(), "should not contain link") }, }, } { diff --git a/processors/minsev/minsev_test.go b/processors/minsev/minsev_test.go index 3f43af455b1..cd676fd3c2b 100644 --- a/processors/minsev/minsev_test.go +++ b/processors/minsev/minsev_test.go @@ -123,7 +123,7 @@ func TestLogProcessorOnEmit(t *testing.T) { r.SetSeverity(sev) assert.NoError(t, p.OnEmit(ctx, r), sev.String()) - if !assert.Lenf(t, wrapped.OnEmitCalls, 0, "Record with severity %s passed-through", sev) { + if !assert.Emptyf(t, wrapped.OnEmitCalls, "Record with severity %s passed-through", sev) { wrapped.Reset() } } @@ -159,7 +159,7 @@ func TestLogProcessorEnabled(t *testing.T) { param.SetSeverity(sev) assert.False(t, p.Enabled(ctx, param), sev.String()) - if !assert.Lenf(t, wrapped.EnabledCalls, 0, "Record with severity %s passed-through", sev) { + if !assert.Emptyf(t, wrapped.EnabledCalls, "Record with severity %s passed-through", sev) { wrapped.Reset() } } @@ -182,7 +182,7 @@ func TestLogProcessorEnabled(t *testing.T) { params.SetSeverity(api.SeverityError) assert.True(t, p.Enabled(ctx, *params)) - assert.Len(t, wrapped.EnabledCalls, 0) + assert.Empty(t, wrapped.EnabledCalls) }) } diff --git a/samplers/aws/xray/internal/manifest_test.go b/samplers/aws/xray/internal/manifest_test.go index 4bb6706938d..15422016f74 100644 --- a/samplers/aws/xray/internal/manifest_test.go +++ b/samplers/aws/xray/internal/manifest_test.go @@ -476,7 +476,7 @@ func TestRefreshManifestMissingRuleName(t *testing.T) { require.NoError(t, err) // assert on rule not added - require.Len(t, m.Rules, 0) + require.Empty(t, m.Rules) } // assert that rule with version greater than one does not update to the manifest. @@ -520,7 +520,7 @@ func TestRefreshManifestIncorrectVersion(t *testing.T) { require.NoError(t, err) // assert on rule not added - require.Len(t, m.Rules, 0) + require.Empty(t, m.Rules) } // assert that 1 valid and 1 invalid rule update only valid rule gets stored to the manifest. diff --git a/samplers/probability/consistent/sampler_test.go b/samplers/probability/consistent/sampler_test.go index a9d5ddc1484..2893c251ec4 100644 --- a/samplers/probability/consistent/sampler_test.go +++ b/samplers/probability/consistent/sampler_test.go @@ -212,9 +212,9 @@ func TestSamplerBehavior(t *testing.T) { } if test.hasErrors { - require.Less(t, 0, len(handler.Errors())) + require.NotEmpty(t, handler.Errors()) } else { - require.Equal(t, 0, len(handler.Errors())) + require.Empty(t, handler.Errors()) } } }) diff --git a/samplers/probability/consistent/statistical_test.go b/samplers/probability/consistent/statistical_test.go index e8bc5330e57..7c679557e8b 100644 --- a/samplers/probability/consistent/statistical_test.go +++ b/samplers/probability/consistent/statistical_test.go @@ -256,7 +256,7 @@ func sampleTrials(t *testing.T, prob float64, degrees testDegrees, upperP pValue // // The test specification ensures the test ensures there are // at least 20 expected items per category in these tests. - require.NotEqual(t, 0, len(counts)) + require.NotEmpty(t, counts) if degrees == 2 { // Note: because the test is probabilistic, we can't be diff --git a/zpages/bucket_test.go b/zpages/bucket_test.go index 1bc0e6525ae..05d6a6cceb2 100644 --- a/zpages/bucket_test.go +++ b/zpages/bucket_test.go @@ -89,5 +89,5 @@ func TestBucketZeroCapacity(t *testing.T) { assert.Equal(t, 0, bkt.len()) bkt.add(&testSpan{endTime: time.Unix(1, 0)}) assert.Equal(t, 0, bkt.len()) - assert.Len(t, bkt.spans(), 0) + assert.Empty(t, bkt.spans()) } diff --git a/zpages/spanprocessor_test.go b/zpages/spanprocessor_test.go index 3bbc40a1881..350f82d8288 100644 --- a/zpages/spanprocessor_test.go +++ b/zpages/spanprocessor_test.go @@ -52,12 +52,12 @@ func TestSpanProcessor(t *testing.T) { assert.Same(t, spans[i], activeSpans[i]) } // No ended spans so there will be no error, no latency samples. - assert.Len(t, zsp.errorSpans(spanName), 0) + assert.Empty(t, zsp.errorSpans(spanName)) for i := 0; i < defaultBoundaries.numBuckets(); i++ { - assert.Len(t, zsp.spansByLatency(spanName, i), 0) + assert.Empty(t, zsp.spansByLatency(spanName, i)) } spansPM := zsp.spansPerMethod() - require.Equal(t, 1, len(spansPM)) + require.Len(t, spansPM, 1) assert.Equal(t, numSpans, spansPM[spanName].activeSpans) // End all Spans, they will end pretty fast, so we can only check that we have at least one in @@ -66,7 +66,7 @@ func TestSpanProcessor(t *testing.T) { s.End() } // Test that no more active spans. - assert.Len(t, zsp.activeSpans(spanName), 0) + assert.Empty(t, zsp.activeSpans(spanName)) assert.LessOrEqual(t, 1, len(zsp.errorSpans(spanName))) numLatencySamples := 0 for i := 0; i < defaultBoundaries.numBuckets(); i++ { @@ -158,13 +158,13 @@ func TestSpanProcessorNegativeLatency(t *testing.T) { zsp.OnStart(context.Background(), ts) spansPM := zsp.spansPerMethod() - require.Equal(t, 1, len(spansPM)) + require.Len(t, spansPM, 1) assert.Equal(t, 1, spansPM["test"].activeSpans) zsp.OnEnd(ts) spansPM = zsp.spansPerMethod() - require.Equal(t, 1, len(spansPM)) + require.Len(t, spansPM, 1) assert.Equal(t, 1, spansPM["test"].latencySpans[0]) }