update test setup

_integration-tests/tests/go-redis.v7/go-redis.go

@@ -47,9 +47,7 @@ func (tc *TestCase) Setup(t *testing.T) {
 			),
 		),
 	)
-	if err != nil {
-		t.Skipf("Failed to start redis test container: %v\n", err)
-	}
+	utils.AssertTestContainersError(t, err)
 
 	redisURI, err := tc.server.ConnectionString(ctx)
 	if err != nil {

_integration-tests/tests/go-redis.v8/go-redis.go

@@ -47,9 +47,7 @@ func (tc *TestCase) Setup(t *testing.T) {
 			),
 		),
 	)
-	if err != nil {
-		t.Skipf("Failed to start redis test container: %v\n", err)
-	}
+	utils.AssertTestContainersError(t, err)
 
 	redisURI, err := tc.server.ConnectionString(ctx)
 	if err != nil {

_integration-tests/tests/ibm_sarama/main.go

@@ -3,6 +3,8 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2023-present Datadog, Inc.
 
+//go:build integration
+
 package ibm_sarama
 
 import (
@@ -46,9 +48,7 @@ func (tc *TestCase) Setup(t *testing.T) {
 		testcontainers.WithLogger(testcontainers.TestLogger(t)),
 		utils.WithTestLogConsumer(t),
 	)
-	if err != nil {
-		t.Skipf("Failed to start kafka test container: %v\n", err)
-	}
+	utils.AssertTestContainersError(t, err)
 
 	addr, err := tc.server.KafkaSeedBroker(ctx)
 	require.NoError(t, err, "failed to get seed broker address")

_integration-tests/tests/mongo/mongo.go

@@ -41,9 +41,7 @@ func (tc *TestCase) Setup(t *testing.T) {
 		testcontainers.WithLogger(testcontainers.TestLogger(t)),
 		utils.WithTestLogConsumer(t),
 	)
-	if err != nil {
-		t.Skipf("Failed to start mongo test container: %v\n", err)
-	}
+	utils.AssertTestContainersError(t, err)
 
 	mongoURI, err := tc.server.ConnectionString(ctx)
 	if err != nil {

_integration-tests/tests/redigo/redigo.go

@@ -46,9 +46,8 @@ func (tc *TestCase) Setup(t *testing.T) {
 			),
 		),
 	)
-	if err != nil {
-		t.Skipf("Failed to start redis test container: %v\n", err)
-	}
+	utils.AssertTestContainersError(t, err)
+
 	redisURI, err := tc.server.ConnectionString(ctx)
 	if err != nil {
 		log.Fatalf("Failed to obtain connection string: %v\n", err)

_integration-tests/tests/shopify_sarama/main.go

@@ -3,6 +3,8 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2023-present Datadog, Inc.
 
+//go:build integration
+
 package shopify_sarama
 
 import (
@@ -46,9 +48,7 @@ func (tc *TestCase) Setup(t *testing.T) {
 		testcontainers.WithLogger(testcontainers.TestLogger(t)),
 		utils.WithTestLogConsumer(t),
 	)
-	if err != nil {
-		t.Skipf("Failed to start kafka test container: %v\n", err)
-	}
+	utils.AssertTestContainersError(t, err)
 
 	addr, err := tc.server.KafkaSeedBroker(ctx)
 	require.NoError(t, err, "failed to get seed broker address")

_integration-tests/tests/vault/vault.go

@@ -37,9 +37,7 @@ func (tc *TestCase) Setup(t *testing.T) {
 		utils.WithTestLogConsumer(t),
 		testvault.WithToken("root"),
 	)
-	if err != nil {
-		t.Skipf("Failed to start vault test container: %v\n", err)
-	}
+	utils.AssertTestContainersError(t, err)
 
 	addr, err := tc.server.HttpHostAddress(ctx)
 	if err != nil {

_integration-tests/utils/testcontainers.go

@@ -26,7 +26,6 @@ func StartDynamoDBTestContainer(t *testing.T) (c testcontainers.Container, host
 			Image:        "amazon/dynamodb-local:latest",
 			ExposedPorts: []string{exposedPort},
 			WaitingFor:   wait.ForHTTP("").WithStatusCodeMatcher(func(int) bool { return true }),
-			Name:         "dynamodb-local",
 			WorkingDir:   "/home/dynamodblocal",
 			Cmd: []string{
 				"-jar", "DynamoDBLocal.jar",
@@ -45,7 +44,7 @@ func StartDynamoDBTestContainer(t *testing.T) (c testcontainers.Container, host
 	server, err := testcontainers.GenericContainer(ctx, req)
 	AssertTestContainersError(t, err)
 
-	mappedPort, err := server.MappedPort(ctx, nat.Port(port))
+	mappedPort, err := server.MappedPort(ctx, nat.Port(exposedPort))
 	require.NoError(t, err)
 
 	host, err = server.Host(ctx)
@@ -61,7 +60,8 @@ func AssertTestContainersError(t *testing.T, err error) {
 		return
 	}
 	if _, ok := os.LookupEnv("CI"); ok && runtime.GOOS != "linux" {
-		t.Skipf("skipping test since the current CI environment failed to start container: %v", err)
+		t.Skipf("failed to start container (CI does not support docker, skipping test): %v", err)
+		return
 	}
 	require.NoError(t, err)
 }