chore: make linter happy

DataDog · Dec 23, 2024 · a371785 · a371785
1 parent 41f8721
commit a371785
Show file tree

Hide file tree

Showing 61 changed files with 169 additions and 169 deletions.
diff --git a/_integration-tests/tests/99designs.gqlgen/gqlgen.go b/_integration-tests/tests/99designs.gqlgen/gqlgen.go
@@ -24,13 +24,13 @@ type TestCase struct {
 	server *handler.Server
 }
 
-func (tc *TestCase) Setup(*testing.T, context.Context) {
+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, _ context.Context) {
+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
@@ -27,7 +27,7 @@ type TestCase struct {
 	cfg    *aws.Config
 }
 
-func (tc *TestCase) Setup(t *testing.T, _ context.Context) {
+func (tc *TestCase) Setup(_ context.Context, t *testing.T) {
 	utils.SkipIfProviderIsNotHealthy(t)
 
 	server, host, port := utils.StartDynamoDBTestContainer(t)
@@ -40,7 +40,7 @@ func (tc *TestCase) Setup(t *testing.T, _ context.Context) {
 	}
 }
 
-func (tc *TestCase) Run(t *testing.T, _ context.Context) {
+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
@@ -27,13 +27,13 @@ type base struct {
 	port   string
 }
 
-func (b *base) setup(t *testing.T, _ context.Context) {
+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 context.Context) {
+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,8 +23,8 @@ type TestCaseLoadDefaultConfig struct {
 	base
 }
 
-func (tc *TestCaseLoadDefaultConfig) Setup(t *testing.T, ctx context.Context) {
-	tc.setup(t, ctx)
+func (tc *TestCaseLoadDefaultConfig) Setup(ctx context.Context, t *testing.T) {
+	tc.setup(ctx, t)
 
 	cfg, err := config.LoadDefaultConfig(ctx,
 		config.WithRegion("test-region-1337"),
@@ -35,8 +35,8 @@ func (tc *TestCaseLoadDefaultConfig) Setup(t *testing.T, ctx context.Context) {
 	tc.cfg = cfg
 }
 
-func (tc *TestCaseLoadDefaultConfig) Run(t *testing.T, ctx context.Context) {
-	tc.base.run(t, ctx)
+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
@@ -21,8 +21,8 @@ type TestCaseNewConfig struct {
 	base
 }
 
-func (tc *TestCaseNewConfig) Setup(t *testing.T, ctx context.Context) {
-	tc.setup(t, ctx)
+func (tc *TestCaseNewConfig) Setup(ctx context.Context, t *testing.T) {
+	tc.setup(ctx, t)
 
 	cfg := aws.NewConfig()
 	cfg.Region = "test-region-1337"
@@ -31,8 +31,8 @@ func (tc *TestCaseNewConfig) Setup(t *testing.T, ctx context.Context) {
 	tc.cfg = *cfg
 }
 
-func (tc *TestCaseNewConfig) Run(t *testing.T, ctx context.Context) {
-	tc.base.run(t, ctx)
+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
@@ -21,8 +21,8 @@ type TestCaseStructLiteral struct {
 	base
 }
 
-func (tc *TestCaseStructLiteral) Setup(t *testing.T, ctx context.Context) {
-	tc.setup(t, ctx)
+func (tc *TestCaseStructLiteral) Setup(ctx context.Context, t *testing.T) {
+	tc.setup(ctx, t)
 
 	tc.cfg = aws.Config{
 		Region:       "test-region-1337",
@@ -31,8 +31,8 @@ func (tc *TestCaseStructLiteral) Setup(t *testing.T, ctx context.Context) {
 	}
 }
 
-func (tc *TestCaseStructLiteral) Run(t *testing.T, ctx context.Context) {
-	tc.base.run(t, ctx)
+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
@@ -21,8 +21,8 @@ type TestCaseStructLiteralPtr struct {
 	base
 }
 
-func (tc *TestCaseStructLiteralPtr) Setup(t *testing.T, ctx context.Context) {
-	tc.setup(t, ctx)
+func (tc *TestCaseStructLiteralPtr) Setup(ctx context.Context, t *testing.T) {
+	tc.setup(ctx, t)
 
 	cfg := &aws.Config{
 		Region:       "test-region-1337",
@@ -32,8 +32,8 @@ func (tc *TestCaseStructLiteralPtr) Setup(t *testing.T, ctx context.Context) {
 	tc.cfg = *cfg
 }
 
-func (tc *TestCaseStructLiteralPtr) Run(t *testing.T, ctx context.Context) {
-	tc.base.run(t, ctx)
+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, _ context.Context) {
+func (tc *TestCase) Setup(_ context.Context, t *testing.T) {
 	router := chi.NewRouter()
 
 	tc.Server = &http.Server{
@@ -46,7 +46,7 @@ func (tc *TestCase) Setup(t *testing.T, _ context.Context) {
 	})
 }
 
-func (tc *TestCase) Run(t *testing.T, _ context.Context) {
+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
@@ -33,16 +33,16 @@ type TestCase struct {
 	addr      []string
 }
 
-func (tc *TestCase) Setup(t *testing.T, _ context.Context) {
+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, ctx context.Context) {
+func (tc *TestCase) Run(ctx context.Context, t *testing.T) {
 	tc.produceMessage(t)
-	tc.consumeMessage(t, ctx)
+	tc.consumeMessage(ctx, t)
 }
 
 func (tc *TestCase) kafkaBootstrapServers() string {
@@ -76,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, ctx context.Context) {
+func (tc *TestCase) consumeMessage(ctx context.Context, t *testing.T) {
 	t.Helper()
 
 	cfg := &kafka.ConfigMap{

diff --git a/_integration-tests/tests/confluent-kafka-go.v2/kafka.go b/_integration-tests/tests/confluent-kafka-go.v2/kafka.go
@@ -33,16 +33,16 @@ type TestCase struct {
 	addr      []string
 }
 
-func (tc *TestCase) Setup(t *testing.T, _ context.Context) {
+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, ctx context.Context) {
+func (tc *TestCase) Run(ctx context.Context, t *testing.T) {
 	tc.produceMessage(t)
-	tc.consumeMessage(t, ctx)
+	tc.consumeMessage(ctx, t)
 }
 
 func (tc *TestCase) kafkaBootstrapServers() string {
@@ -76,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, ctx context.Context) {
+func (tc *TestCase) consumeMessage(ctx context.Context, t *testing.T) {
 	t.Helper()
 
 	cfg := &kafka.ConfigMap{

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

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, _ context.Context) {
+func (tc *TestCase) Setup(_ context.Context, t *testing.T) {
 	tc.Echo = echo.New()
 	tc.Echo.Logger.SetOutput(io.Discard)
 
@@ -44,7 +44,7 @@ func (tc *TestCase) Setup(t *testing.T, _ context.Context) {
 	})
 }
 
-func (tc *TestCase) Run(t *testing.T, _ context.Context) {
+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)

diff --git a/_integration-tests/tests/fiber.v2/fiber.go b/_integration-tests/tests/fiber.v2/fiber.go
@@ -25,7 +25,7 @@ type TestCase struct {
 	addr string
 }
 
-func (tc *TestCase) Setup(t *testing.T, _ context.Context) {
+func (tc *TestCase) Setup(_ context.Context, t *testing.T) {
 	tc.App = fiber.New(fiber.Config{DisableStartupMessage: true})
 	tc.App.Get("/ping", func(c *fiber.Ctx) error { return c.JSON(map[string]any{"message": "pong"}) })
 	tc.addr = "127.0.0.1:" + utils.GetFreePort(t)
@@ -36,7 +36,7 @@ func (tc *TestCase) Setup(t *testing.T, _ context.Context) {
 	})
 }
 
-func (tc *TestCase) Run(t *testing.T, _ context.Context) {
+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)

diff --git a/_integration-tests/tests/gcp_pubsub/gcp_pubsub.go b/_integration-tests/tests/gcp_pubsub/gcp_pubsub.go
@@ -36,7 +36,7 @@ type TestCase struct {
 	messageID   string
 }
 
-func (tc *TestCase) Setup(t *testing.T, ctx context.Context) {
+func (tc *TestCase) Setup(ctx context.Context, t *testing.T) {
 	utils.SkipIfProviderIsNotHealthy(t)
 
 	var err error
@@ -70,7 +70,7 @@ func (tc *TestCase) Setup(t *testing.T, ctx context.Context) {
 	require.NoError(t, err)
 }
 
-func (tc *TestCase) publishMessage(t *testing.T, ctx context.Context) {
+func (tc *TestCase) publishMessage(ctx context.Context, t *testing.T) {
 	t.Helper()
 
 	topic := tc.client.Topic(testTopic)
@@ -84,7 +84,7 @@ func (tc *TestCase) publishMessage(t *testing.T, ctx context.Context) {
 	t.Log("finished publishing result", id)
 }
 
-func (tc *TestCase) receiveMessage(t *testing.T, ctx context.Context) {
+func (tc *TestCase) receiveMessage(ctx context.Context, t *testing.T) {
 	t.Helper()
 
 	sub := tc.client.Subscription(testSubscription)
@@ -100,9 +100,9 @@ func (tc *TestCase) receiveMessage(t *testing.T, ctx context.Context) {
 	require.NotErrorIs(t, ctx.Err(), context.DeadlineExceeded)
 }
 
-func (tc *TestCase) Run(t *testing.T, ctx context.Context) {
-	tc.publishMessage(t, ctx)
-	tc.receiveMessage(t, ctx)
+func (tc *TestCase) Run(ctx context.Context, t *testing.T) {
+	tc.publishMessage(ctx, t)
+	tc.receiveMessage(ctx, t)
 }
 
 func (tc *TestCase) ExpectedTraces() trace.Traces {

diff --git a/_integration-tests/tests/gin/gin.go b/_integration-tests/tests/gin/gin.go
@@ -24,7 +24,7 @@ type TestCase struct {
 	*http.Server
 }
 
-func (tc *TestCase) Setup(t *testing.T, _ context.Context) {
+func (tc *TestCase) Setup(_ context.Context, t *testing.T) {
 	gin.SetMode(gin.ReleaseMode) // Silence start-up logging
 	engine := gin.New()
 
@@ -44,7 +44,7 @@ func (tc *TestCase) Setup(t *testing.T, _ context.Context) {
 	})
 }
 
-func (tc *TestCase) Run(t *testing.T, _ context.Context) {
+func (tc *TestCase) Run(_ context.Context, t *testing.T) {
 	resp, err := http.Get("http://" + tc.Server.Addr + "/ping")
 	require.NoError(t, err)
 	require.Equal(t, http.StatusOK, resp.StatusCode)

diff --git a/_integration-tests/tests/go-elasticsearch/base.go b/_integration-tests/tests/go-elasticsearch/base.go
@@ -34,7 +34,7 @@ type base struct {
 	client    esClient
 }
 
-func (b *base) Setup(t *testing.T, ctx context.Context, image string, newClient func(addr string, caCert []byte) (esClient, error)) {
+func (b *base) Setup(ctx context.Context, t *testing.T, image string, newClient func(addr string, caCert []byte) (esClient, error)) {
 	utils.SkipIfProviderIsNotHealthy(t)
 
 	var err error
@@ -51,7 +51,7 @@ func (b *base) Setup(t *testing.T, ctx context.Context, image string, newClient
 	require.NoError(t, err)
 }
 
-func (b *base) Run(t *testing.T, ctx context.Context, doRequest func(t *testing.T, client esClient, body io.Reader)) {
+func (b *base) Run(ctx context.Context, t *testing.T, doRequest func(t *testing.T, client esClient, body io.Reader)) {
 	span, ctx := tracer.StartSpanFromContext(ctx, "test.root")
 	defer span.Finish()
 

diff --git a/_integration-tests/tests/go-elasticsearch/v6.go b/_integration-tests/tests/go-elasticsearch/v6.go
@@ -23,22 +23,22 @@ type TestCaseV6 struct {
 	base
 }
 
-func (tc *TestCaseV6) Setup(t *testing.T, ctx context.Context) {
+func (tc *TestCaseV6) Setup(ctx context.Context, t *testing.T) {
 	// skip test if CI runner os arch is not amd64
 	if _, ok := os.LookupEnv("CI"); ok && runtime.GOOS == "linux" && runtime.GOARCH != "amd64" {
 		t.Skip("Skipping test as the official elasticsearch v6 docker image only supports amd64")
 	} else if runtime.GOOS == "darwin" && runtime.GOARCH != "amd64" {
 		t.Skip("Skipping test as the official elasticsearch v6 docker image cannot run under rosetta")
 	}
-	tc.base.Setup(t, ctx, "docker.elastic.co/elasticsearch/elasticsearch:6.8.23", func(addr string, _ []byte) (esClient, error) {
+	tc.base.Setup(ctx, t, "docker.elastic.co/elasticsearch/elasticsearch:6.8.23", func(addr string, _ []byte) (esClient, error) {
 		return elasticsearch.NewClient(elasticsearch.Config{
 			Addresses: []string{addr},
 		})
 	})
 }
 
-func (tc *TestCaseV6) Run(t *testing.T, ctx context.Context) {
-	tc.base.Run(t, ctx, func(t *testing.T, client esClient, body io.Reader) {
+func (tc *TestCaseV6) Run(ctx context.Context, t *testing.T) {
+	tc.base.Run(ctx, t, func(t *testing.T, client esClient, body io.Reader) {
 		t.Helper()
 		req := esapi.IndexRequest{
 			Index:      "test",

diff --git a/_integration-tests/tests/go-elasticsearch/v7.go b/_integration-tests/tests/go-elasticsearch/v7.go
@@ -21,16 +21,16 @@ type TestCaseV7 struct {
 	base
 }
 
-func (tc *TestCaseV7) Setup(t *testing.T, ctx context.Context) {
-	tc.base.Setup(t, ctx, "docker.elastic.co/elasticsearch/elasticsearch:7.17.24", func(addr string, _ []byte) (esClient, error) {
+func (tc *TestCaseV7) Setup(ctx context.Context, t *testing.T) {
+	tc.base.Setup(ctx, t, "docker.elastic.co/elasticsearch/elasticsearch:7.17.24", func(addr string, _ []byte) (esClient, error) {
 		return elasticsearch.NewClient(elasticsearch.Config{
 			Addresses: []string{addr},
 		})
 	})
 }
 
-func (tc *TestCaseV7) Run(t *testing.T, ctx context.Context) {
-	tc.base.Run(t, ctx, func(t *testing.T, client esClient, body io.Reader) {
+func (tc *TestCaseV7) Run(ctx context.Context, t *testing.T) {
+	tc.base.Run(ctx, t, func(t *testing.T, client esClient, body io.Reader) {
 		t.Helper()
 		req := esapi.IndexRequest{
 			Index:      "test",