ci: stdout all processes

Author: wrn14897

smoke-tests/smoke-sdk-grpc-ts.bats

@@ -10,7 +10,7 @@ NODE_METER_NAME="node-monitor-meter"
 setup_file() {
 	echo "# 🚧 Starting smoke-sdk-grpc-ts tests" >&3
 	echo "# 📦 Building and starting containers: collector ${CONTAINER_NAME}" >&3
-	docker compose up --build --detach collector ${CONTAINER_NAME}
+	docker compose up --build --detach collector ${CONTAINER_NAME} >&3 2>&3
 	wait_for_ready_app ${CONTAINER_NAME}
 	echo "# 🌐 Sending test request to http://localhost:3000" >&3
 	curl --silent "http://localhost:3000"
@@ -23,9 +23,9 @@ teardown_file() {
 	echo "# 💾 Saving collector data to data-${CONTAINER_NAME}.json" >&3
 	cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json
 	echo "# 🛑 Stopping ${CONTAINER_NAME} container" >&3
-	docker compose stop ${CONTAINER_NAME}
+	docker compose stop ${CONTAINER_NAME} >&3 2>&3
 	echo "# 🔄 Restarting collector" >&3
-	docker compose restart collector
+	docker compose restart collector >&3 2>&3
 	wait_for_flush
 }
 

smoke-tests/smoke-sdk-grpc.bats

@@ -9,7 +9,7 @@ METER_NAME="hello-world-meter"
 setup_file() {
 	echo "# 🚧 Starting smoke-sdk-grpc tests" >&3
 	echo "# 📦 Building and starting containers: collector ${CONTAINER_NAME}" >&3
-	docker compose up --build --detach collector ${CONTAINER_NAME}
+	docker compose up --build --detach collector ${CONTAINER_NAME} >&3 2>&3
 	wait_for_ready_app ${CONTAINER_NAME}
 	echo "# 🌐 Sending test request to http://localhost:3000" >&3
 	curl --silent "http://localhost:3000"
@@ -22,9 +22,9 @@ teardown_file() {
 	echo "# 💾 Saving collector data to data-${CONTAINER_NAME}.json" >&3
 	cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json
 	echo "# 🛑 Stopping ${CONTAINER_NAME} container" >&3
-	docker compose stop ${CONTAINER_NAME}
+	docker compose stop ${CONTAINER_NAME} >&3 2>&3
 	echo "# 🔄 Restarting collector" >&3
-	docker compose restart collector
+	docker compose restart collector >&3 2>&3
 	wait_for_flush
 }
 

smoke-tests/smoke-sdk-http-ts.bats

@@ -10,7 +10,7 @@ NODE_METER_NAME="node-monitor-meter"
 setup_file() {
 	echo "# 🚧 Starting smoke-sdk-http-ts tests" >&3
 	echo "# 📦 Building and starting containers: collector ${CONTAINER_NAME}" >&3
-	docker compose up --build --detach collector ${CONTAINER_NAME}
+	docker compose up --build --detach collector ${CONTAINER_NAME} >&3 2>&3
 	wait_for_ready_app ${CONTAINER_NAME}
 	echo "# 🌐 Sending test request to http://localhost:3000" >&3
 	curl --silent "http://localhost:3000"
@@ -23,9 +23,9 @@ teardown_file() {
 	echo "# 💾 Saving collector data to data-${CONTAINER_NAME}.json" >&3
 	cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json
 	echo "# 🛑 Stopping ${CONTAINER_NAME} container" >&3
-	docker compose stop ${CONTAINER_NAME}
+	docker compose stop ${CONTAINER_NAME} >&3 2>&3
 	echo "# 🔄 Restarting collector" >&3
-	docker compose restart collector
+	docker compose restart collector >&3 2>&3
 	wait_for_flush
 }
 

smoke-tests/smoke-sdk-http.bats

@@ -9,7 +9,7 @@ METER_NAME="hello-world-meter"
 setup_file() {
 	echo "# 🚧 Starting smoke-sdk-http tests" >&3
 	echo "# 📦 Building and starting containers: collector ${CONTAINER_NAME}" >&3
-	docker compose up --build --detach collector ${CONTAINER_NAME}
+	docker compose up --build --detach collector ${CONTAINER_NAME} >&3 2>&3
 	wait_for_ready_app ${CONTAINER_NAME}
 	echo "# 🌐 Sending test request to http://localhost:3000" >&3
 	curl --silent "http://localhost:3000"
@@ -22,9 +22,9 @@ teardown_file() {
 	echo "# 💾 Saving collector data to data-${CONTAINER_NAME}.json" >&3
 	cp collector/data.json collector/data-results/data-${CONTAINER_NAME}.json
 	echo "# 🛑 Stopping ${CONTAINER_NAME} container" >&3
-	docker compose stop ${CONTAINER_NAME}
+	docker compose stop ${CONTAINER_NAME} >&3 2>&3
 	echo "# 🔄 Restarting collector" >&3
-	docker compose restart collector
+	docker compose restart collector >&3 2>&3
 	wait_for_flush
 }
 

smoke-tests/test_helpers/utilities.bash

@@ -100,14 +100,18 @@ wait_for_flush() {
 wait_for_ready_app() {
 	CONTAINER=${1:?container name is a required parameter}
 	MAX_RETRIES=10
-	echo -n "# 🍿 Setting up ${CONTAINER}" >&3
+	echo "# 🍿 Setting up ${CONTAINER}" >&3
 	NEXT_WAIT_TIME=0
-	until [ $NEXT_WAIT_TIME -eq $MAX_RETRIES ] || [[ $(docker compose logs ${CONTAINER} | grep "Now listening on:") ]]
+	until [ $NEXT_WAIT_TIME -eq $MAX_RETRIES ] || [[ $(docker compose logs ${CONTAINER} 2>&1) =~ "Now listening on:" ]]
 	do
-		echo -n " ... $(( NEXT_WAIT_TIME++ ))s" >&3
-		sleep $NEXT_WAIT_TIME
+		echo "# ... waiting $(( NEXT_WAIT_TIME ))s" >&3
+		if [ $NEXT_WAIT_TIME -gt 0 ]; then
+			echo "# Container logs:" >&3
+			docker compose logs ${CONTAINER} 2>&1 | tail -10 >&3
+		fi
+		sleep $(( NEXT_WAIT_TIME++ ))
 	done
-	echo "" >&3
+	echo "# ✓ ${CONTAINER} is ready" >&3
 	[ $NEXT_WAIT_TIME -lt $MAX_RETRIES ]
 }