chore: update all dependencies (#480)

Updated all go.mod dependencies to latest. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Romain Marcadier <[email protected]> Co-authored-by: Romain Marcadier <[email protected]>
DataDog · Dec 23, 2024 · f729796 · f729796
1 parent 81ab050
commit f729796
Show file tree

Hide file tree

Showing 67 changed files with 419 additions and 395 deletions.
diff --git a/_integration-tests/tests/99designs.gqlgen/gqlgen.go b/_integration-tests/tests/99designs.gqlgen/gqlgen.go
@@ -8,6 +8,7 @@
 package gqlgen
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
@@ -23,13 +24,13 @@ type TestCase struct {
 	server *handler.Server
 }
 
-func (tc *TestCase) Setup(*testing.T) {
+func (tc *TestCase) Setup(context.Context, *testing.T) {
 	schema := graph.NewExecutableSchema(graph.Config{Resolvers: &graph.Resolver{}})
 	tc.server = handler.New(schema)
 	tc.server.AddTransport(transport.POST{})
 }
 
-func (tc *TestCase) Run(t *testing.T) {
+func (tc *TestCase) Run(_ context.Context, t *testing.T) {
 	c := client.New(tc.server)
 
 	const (

diff --git a/_integration-tests/tests/aws.v1/aws.go b/_integration-tests/tests/aws.v1/aws.go
@@ -8,6 +8,7 @@
 package awsv1
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
@@ -26,7 +27,7 @@ type TestCase struct {
 	cfg    *aws.Config
 }
 
-func (tc *TestCase) Setup(t *testing.T) {
+func (tc *TestCase) Setup(_ context.Context, t *testing.T) {
 	utils.SkipIfProviderIsNotHealthy(t)
 
 	server, host, port := utils.StartDynamoDBTestContainer(t)
@@ -39,7 +40,7 @@ func (tc *TestCase) Setup(t *testing.T) {
 	}
 }
 
-func (tc *TestCase) Run(t *testing.T) {
+func (tc *TestCase) Run(_ context.Context, t *testing.T) {
 	ddb := dynamodb.New(session.Must(session.NewSession(tc.cfg)))
 	_, err := ddb.ListTables(nil)
 	require.NoError(t, err)

diff --git a/_integration-tests/tests/aws.v2/base.go b/_integration-tests/tests/aws.v2/base.go
@@ -11,7 +11,6 @@ import (
 	"context"
 	"fmt"
 	"testing"
-	"time"
 
 	"datadoghq.dev/orchestrion/_integration-tests/utils"
 	"datadoghq.dev/orchestrion/_integration-tests/validator/trace"
@@ -28,15 +27,13 @@ type base struct {
 	port   string
 }
 
-func (b *base) setup(t *testing.T) {
+func (b *base) setup(_ context.Context, t *testing.T) {
 	utils.SkipIfProviderIsNotHealthy(t)
 
 	b.server, b.host, b.port = utils.StartDynamoDBTestContainer(t)
 }
 
-func (b *base) run(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
-	defer cancel()
+func (b *base) run(ctx context.Context, t *testing.T) {
 	ddb := dynamodb.NewFromConfig(b.cfg)
 	_, err := ddb.ListTables(ctx, nil)
 	require.NoError(t, err)

diff --git a/_integration-tests/tests/aws.v2/load_default_config.go b/_integration-tests/tests/aws.v2/load_default_config.go
@@ -23,10 +23,10 @@ type TestCaseLoadDefaultConfig struct {
 	base
 }
 
-func (tc *TestCaseLoadDefaultConfig) Setup(t *testing.T) {
-	tc.setup(t)
+func (tc *TestCaseLoadDefaultConfig) Setup(ctx context.Context, t *testing.T) {
+	tc.setup(ctx, t)
 
-	cfg, err := config.LoadDefaultConfig(context.Background(),
+	cfg, err := config.LoadDefaultConfig(ctx,
 		config.WithRegion("test-region-1337"),
 		config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider("NOTANACCESSKEY", "NOTASECRETKEY", "")),
 	)
@@ -35,8 +35,8 @@ func (tc *TestCaseLoadDefaultConfig) Setup(t *testing.T) {
 	tc.cfg = cfg
 }
 
-func (tc *TestCaseLoadDefaultConfig) Run(t *testing.T) {
-	tc.base.run(t)
+func (tc *TestCaseLoadDefaultConfig) Run(ctx context.Context, t *testing.T) {
+	tc.base.run(ctx, t)
 }
 
 func (tc *TestCaseLoadDefaultConfig) ExpectedTraces() trace.Traces {

diff --git a/_integration-tests/tests/aws.v2/new_config.go b/_integration-tests/tests/aws.v2/new_config.go
@@ -8,6 +8,7 @@
 package awsv2
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
@@ -20,8 +21,8 @@ type TestCaseNewConfig struct {
 	base
 }
 
-func (tc *TestCaseNewConfig) Setup(t *testing.T) {
-	tc.setup(t)
+func (tc *TestCaseNewConfig) Setup(ctx context.Context, t *testing.T) {
+	tc.setup(ctx, t)
 
 	cfg := aws.NewConfig()
 	cfg.Region = "test-region-1337"
@@ -30,8 +31,8 @@ func (tc *TestCaseNewConfig) Setup(t *testing.T) {
 	tc.cfg = *cfg
 }
 
-func (tc *TestCaseNewConfig) Run(t *testing.T) {
-	tc.base.run(t)
+func (tc *TestCaseNewConfig) Run(ctx context.Context, t *testing.T) {
+	tc.base.run(ctx, t)
 }
 
 func (tc *TestCaseNewConfig) ExpectedTraces() trace.Traces {

diff --git a/_integration-tests/tests/aws.v2/struct_literal.go b/_integration-tests/tests/aws.v2/struct_literal.go
@@ -8,6 +8,7 @@
 package awsv2
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
@@ -20,8 +21,8 @@ type TestCaseStructLiteral struct {
 	base
 }
 
-func (tc *TestCaseStructLiteral) Setup(t *testing.T) {
-	tc.setup(t)
+func (tc *TestCaseStructLiteral) Setup(ctx context.Context, t *testing.T) {
+	tc.setup(ctx, t)
 
 	tc.cfg = aws.Config{
 		Region:       "test-region-1337",
@@ -30,8 +31,8 @@ func (tc *TestCaseStructLiteral) Setup(t *testing.T) {
 	}
 }
 
-func (tc *TestCaseStructLiteral) Run(t *testing.T) {
-	tc.base.run(t)
+func (tc *TestCaseStructLiteral) Run(ctx context.Context, t *testing.T) {
+	tc.base.run(ctx, t)
 }
 
 func (tc *TestCaseStructLiteral) ExpectedTraces() trace.Traces {

diff --git a/_integration-tests/tests/aws.v2/struct_literal_ptr.go b/_integration-tests/tests/aws.v2/struct_literal_ptr.go
@@ -8,6 +8,7 @@
 package awsv2
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
@@ -20,8 +21,8 @@ type TestCaseStructLiteralPtr struct {
 	base
 }
 
-func (tc *TestCaseStructLiteralPtr) Setup(t *testing.T) {
-	tc.setup(t)
+func (tc *TestCaseStructLiteralPtr) Setup(ctx context.Context, t *testing.T) {
+	tc.setup(ctx, t)
 
 	cfg := &aws.Config{
 		Region:       "test-region-1337",
@@ -31,8 +32,8 @@ func (tc *TestCaseStructLiteralPtr) Setup(t *testing.T) {
 	tc.cfg = *cfg
 }
 
-func (tc *TestCaseStructLiteralPtr) Run(t *testing.T) {
-	tc.base.run(t)
+func (tc *TestCaseStructLiteralPtr) Run(ctx context.Context, t *testing.T) {
+	tc.base.run(ctx, t)
 }
 
 func (tc *TestCaseStructLiteralPtr) ExpectedTraces() trace.Traces {

diff --git a/_integration-tests/tests/chi.v5/chi.go b/_integration-tests/tests/chi.v5/chi.go
@@ -25,7 +25,7 @@ type TestCase struct {
 	*http.Server
 }
 
-func (tc *TestCase) Setup(t *testing.T) {
+func (tc *TestCase) Setup(_ context.Context, t *testing.T) {
 	router := chi.NewRouter()
 
 	tc.Server = &http.Server{
@@ -39,13 +39,14 @@ func (tc *TestCase) Setup(t *testing.T) {
 
 	go func() { assert.ErrorIs(t, tc.Server.ListenAndServe(), http.ErrServerClosed) }()
 	t.Cleanup(func() {
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+		// Using a new 10s-timeout context, as we may be running cleanup after the original context expired.
+		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 		defer cancel()
 		assert.NoError(t, tc.Server.Shutdown(ctx))
 	})
 }
 
-func (tc *TestCase) Run(t *testing.T) {
+func (tc *TestCase) Run(_ context.Context, t *testing.T) {
 	resp, err := http.Get(fmt.Sprintf("http://%s/", tc.Server.Addr))
 	require.NoError(t, err)
 	require.Equal(t, http.StatusOK, resp.StatusCode)

diff --git a/_integration-tests/tests/confluent-kafka-go.v1/kafka.go b/_integration-tests/tests/confluent-kafka-go.v1/kafka.go
@@ -8,6 +8,7 @@
 package kafka
 
 import (
+	"context"
 	"strings"
 	"testing"
 	"time"
@@ -17,6 +18,7 @@ import (
 	kafkatest "github.com/testcontainers/testcontainers-go/modules/kafka"
 
 	"datadoghq.dev/orchestrion/_integration-tests/utils"
+	"datadoghq.dev/orchestrion/_integration-tests/utils/backoff"
 	"datadoghq.dev/orchestrion/_integration-tests/validator/trace"
 )
 
@@ -31,16 +33,16 @@ type TestCase struct {
 	addr      []string
 }
 
-func (tc *TestCase) Setup(t *testing.T) {
+func (tc *TestCase) Setup(_ context.Context, t *testing.T) {
 	utils.SkipIfProviderIsNotHealthy(t)
 	container, addr := utils.StartKafkaTestContainer(t)
 	tc.container = container
 	tc.addr = []string{addr}
 }
 
-func (tc *TestCase) Run(t *testing.T) {
+func (tc *TestCase) Run(ctx context.Context, t *testing.T) {
 	tc.produceMessage(t)
-	tc.consumeMessage(t)
+	tc.consumeMessage(ctx, t)
 }
 
 func (tc *TestCase) kafkaBootstrapServers() string {
@@ -74,7 +76,7 @@ func (tc *TestCase) produceMessage(t *testing.T) {
 	require.NoError(t, err, "failed to send message")
 }
 
-func (tc *TestCase) consumeMessage(t *testing.T) {
+func (tc *TestCase) consumeMessage(ctx context.Context, t *testing.T) {
 	t.Helper()
 
 	cfg := &kafka.ConfigMap{
@@ -94,7 +96,12 @@ func (tc *TestCase) consumeMessage(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	m, err := c.ReadMessage(3000 * time.Millisecond)
+	m, err := backoff.Retry(
+		ctx,
+		backoff.NewExponentialStrategy(100*time.Millisecond, 2, time.Second),
+		func() (*kafka.Message, error) { return c.ReadMessage(3 * time.Second) },
+		nil,
+	)
 	require.NoError(t, err)
 
 	_, err = c.CommitMessage(m)

diff --git a/_integration-tests/tests/confluent-kafka-go.v2/kafka.go b/_integration-tests/tests/confluent-kafka-go.v2/kafka.go
@@ -8,6 +8,7 @@
 package kafka
 
 import (
+	"context"
 	"strings"
 	"testing"
 	"time"
@@ -17,6 +18,7 @@ import (
 	kafkatest "github.com/testcontainers/testcontainers-go/modules/kafka"
 
 	"datadoghq.dev/orchestrion/_integration-tests/utils"
+	"datadoghq.dev/orchestrion/_integration-tests/utils/backoff"
 	"datadoghq.dev/orchestrion/_integration-tests/validator/trace"
 )
 
@@ -31,16 +33,16 @@ type TestCase struct {
 	addr      []string
 }
 
-func (tc *TestCase) Setup(t *testing.T) {
+func (tc *TestCase) Setup(_ context.Context, t *testing.T) {
 	utils.SkipIfProviderIsNotHealthy(t)
 	container, addr := utils.StartKafkaTestContainer(t)
 	tc.container = container
 	tc.addr = []string{addr}
 }
 
-func (tc *TestCase) Run(t *testing.T) {
+func (tc *TestCase) Run(ctx context.Context, t *testing.T) {
 	tc.produceMessage(t)
-	tc.consumeMessage(t)
+	tc.consumeMessage(ctx, t)
 }
 
 func (tc *TestCase) kafkaBootstrapServers() string {
@@ -74,7 +76,7 @@ func (tc *TestCase) produceMessage(t *testing.T) {
 	require.NoError(t, err, "failed to send message")
 }
 
-func (tc *TestCase) consumeMessage(t *testing.T) {
+func (tc *TestCase) consumeMessage(ctx context.Context, t *testing.T) {
 	t.Helper()
 
 	cfg := &kafka.ConfigMap{
@@ -94,7 +96,12 @@ func (tc *TestCase) consumeMessage(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	m, err := c.ReadMessage(3000 * time.Millisecond)
+	m, err := backoff.Retry(
+		ctx,
+		backoff.NewExponentialStrategy(100*time.Millisecond, 2, time.Second),
+		func() (*kafka.Message, error) { return c.ReadMessage(3 * time.Second) },
+		nil,
+	)
 	require.NoError(t, err)
 
 	_, err = c.CommitMessage(m)

diff --git a/_integration-tests/tests/dd-span/ddspan.go b/_integration-tests/tests/dd-span/ddspan.go
@@ -18,10 +18,10 @@ import (
 
 type TestCase struct{}
 
-func (*TestCase) Setup(*testing.T) {}
+func (*TestCase) Setup(context.Context, *testing.T) {}
 
-func (*TestCase) Run(t *testing.T) {
-	span, ctx := tracer.StartSpanFromContext(context.Background(), "test.root")
+func (*TestCase) Run(ctx context.Context, t *testing.T) {
+	span, ctx := tracer.StartSpanFromContext(ctx, "test.root")
 	defer span.Finish()
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, "http://localhost:0/", nil)

diff --git a/_integration-tests/tests/echo.v4/echo.go b/_integration-tests/tests/echo.v4/echo.go
@@ -26,7 +26,7 @@ type TestCase struct {
 	addr string
 }
 
-func (tc *TestCase) Setup(t *testing.T) {
+func (tc *TestCase) Setup(_ context.Context, t *testing.T) {
 	tc.Echo = echo.New()
 	tc.Echo.Logger.SetOutput(io.Discard)
 
@@ -37,13 +37,14 @@ func (tc *TestCase) Setup(t *testing.T) {
 
 	go func() { assert.ErrorIs(t, tc.Echo.Start(tc.addr), http.ErrServerClosed) }()
 	t.Cleanup(func() {
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+		// Using a new 10s-timeout context, as we may be running cleanup after the original context expired.
+		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 		defer cancel()
 		require.NoError(t, tc.Echo.Shutdown(ctx))
 	})
 }
 
-func (tc *TestCase) Run(t *testing.T) {
+func (tc *TestCase) Run(_ context.Context, t *testing.T) {
 	resp, err := http.Get("http://" + tc.addr + "/ping")
 	require.NoError(t, err)
 	require.Equal(t, http.StatusOK, resp.StatusCode)