fix: channel race condition

Author: skl

test/integration/components/testserver/testserver.go

@@ -48,51 +48,51 @@ func main() {
 	}
 	setupLog(&cfg)
 
-	wait := make(chan struct{})
+	wait := make(chan struct{}, 1)
 	go func() {
 		std.Setup(cfg.STDPort)
-		close(wait)
+		wait <- struct{}{}
 	}()
 	go func() {
 		std.SetupTLS(cfg.STDTLSPort)
-		close(wait)
+		wait <- struct{}{}
 	}()
 	go func() {
 		gin2.SetMode(gin2.ReleaseMode)
 		gin.Setup(cfg.GinPort)
-		close(wait)
+		wait <- struct{}{}
 	}()
 	go func() {
 		gorilla.Setup(cfg.GorillaPort, cfg.STDPort)
-		close(wait)
+		wait <- struct{}{}
 	}()
 	go func() {
 		gorillamid.Setup(cfg.GorillaMidPort, cfg.STDPort)
-		close(wait)
+		wait <- struct{}{}
 	}()
 	go func() {
 		gorillamid2.Setup(cfg.GorillaMid2Port, cfg.STDPort)
-		close(wait)
+		wait <- struct{}{}
 	}()
 	go func() {
 		err := grpctest.Setup(cfg.GRPCPort)
 		if err != nil {
 			slog.Error("HTTP server has unexpectedly stopped", "error", err)
 		}
-		close(wait)
+		wait <- struct{}{}
 	}()
 
 	go func() {
 		err := grpctest.SetupTLS(cfg.GRPCTLSPort)
 		if err != nil {
 			slog.Error("HTTP server has unexpectedly stopped", "error", err)
 		}
-		close(wait)
+		wait <- struct{}{}
 	}()
 
 	go func() {
 		jsonrpc.Setup(cfg.JSONRPCPort)
-		close(wait)
+		wait <- struct{}{}
 	}()
 
 	// wait indefinitely unless any server crashes

test/integration/components/testserver_1.17/testserver.go

@@ -37,38 +37,38 @@ type config struct {
 func main() {
 	cfg := config{}
 	if err := env.Parse(&cfg); err != nil {
-		fmt.Printf("can't load configuration from environment %w\n", err)
+		fmt.Printf("can't load configuration from environment: %v\n", err)
 		os.Exit(-1)
 	}
 
-	wait := make(chan struct{})
+	wait := make(chan struct{}, 1)
 	go func() {
 		std.Setup(cfg.STDPort)
-		close(wait)
+		wait <- struct{}{}
 	}()
 	go func() {
 		gin2.SetMode(gin2.ReleaseMode)
 		gin.Setup(cfg.GinPort)
-		close(wait)
+		wait <- struct{}{}
 	}()
 	go func() {
 		gorilla.Setup(cfg.GorillaPort, cfg.STDPort)
-		close(wait)
+		wait <- struct{}{}
 	}()
 	go func() {
 		gorillamid.Setup(cfg.GorillaMidPort, cfg.STDPort)
-		close(wait)
+		wait <- struct{}{}
 	}()
 	go func() {
 		gorillamid2.Setup(cfg.GorillaMid2Port, cfg.STDPort)
-		close(wait)
+		wait <- struct{}{}
 	}()
 	go func() {
 		err := grpctest.Setup()
 		if err != nil {
-			fmt.Printf("HTTP server has unexpectedly stopped %w\n", err)
+			fmt.Printf("HTTP server has unexpectedly stopped: %v\n", err)
 		}
-		close(wait)
+		wait <- struct{}{}
 	}()
 
 	// wait indefinitely unless any server crashes

test/integration/docker-compose-multiexec-host.yml

@@ -25,6 +25,9 @@ services:
       - "38080:8080"
     environment:
       LOG_LEVEL: DEBUG
+    depends_on:
+      testserver:
+        condition: service_started
 
   testserver1:
     build:

test/integration/docker-compose-multiexec-otelsdk.yml

@@ -17,6 +17,9 @@ services:
       - "38080:8080"
     environment:
       LOG_LEVEL: DEBUG
+    depends_on:
+      testserver:
+        condition: service_started
 
   testserver1:
     build:

test/integration/docker-compose-multiexec.yml

@@ -25,6 +25,9 @@ services:
       - "38080:8080"
     environment:
       LOG_LEVEL: DEBUG
+    depends_on:
+      testserver:
+        condition: service_started
 
   testserver1:
     build: