Merge branch 'main' into go-workfile

* main:
  chore: use require.Len instead of assert.Len (testcontainers#2854)
  chore: bump ryuk to 0.11.0 (testcontainers#2853)
  chore: enable usestdlibvars linter (testcontainers#2850)
  fix(compose): container initialisation (testcontainers#2844)
  fix!: data races (testcontainers#2843)
  fix: mongodb replicaset should work with auth (testcontainers#2847)

.golangci.yml

@@ -7,11 +7,14 @@ linters:
     - gofumpt
     - misspell
     - nolintlint
-    - nonamedreturns
+    - nakedret
     - testifylint
     - thelper
+    - usestdlibvars
 
 linters-settings:
+  nakedret:
+    max-func-lines: 0
   errorlint:
     # Check whether fmt.Errorf uses the %w verb for formatting errors.
     # See the https://github.com/polyfloyd/go-errorlint for caveats.

commons-test.mk

@@ -47,7 +47,8 @@ test-%: $(GOBIN)/gotestsum
 		-- \
 		-v \
 		-coverprofile=coverage.out \
-		-timeout=30m
+		-timeout=30m \
+		-race
 
 .PHONY: tools
 tools:

container.go

@@ -167,6 +167,15 @@ type ContainerRequest struct {
 	LogConsumerCfg          *LogConsumerConfig                         // define the configuration for the log producer and its log consumers to follow the logs
 }
 
+// sessionID returns the session ID for the container request.
+func (c *ContainerRequest) sessionID() string {
+	if sessionID := c.Labels[core.LabelSessionID]; sessionID != "" {
+		return sessionID
+	}
+
+	return core.SessionID()
+}
+
 // containerOptions functional options for a container
 type containerOptions struct {
 	ImageName           string