Fixed Wavefront

acceptance-tests/src/test/groovy/io/spring/cloud/samples/brewery/acceptance/ObservabilityBreweryAcceptanceTests.java

@@ -1,30 +1,28 @@
 package io.spring.cloud.samples.brewery.acceptance;
 
 import io.spring.cloud.samples.brewery.acceptance.common.AbstractBreweryAcceptance;
+import io.spring.cloud.samples.brewery.acceptance.common.tech.TestConditions;
 import io.spring.cloud.samples.brewery.acceptance.model.CommunicationType;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class ObservabilityBreweryAcceptanceTests extends AbstractBreweryAcceptance {
     @BeforeEach
     public void before() {
-
+        TestConditions.assumeNotWavefront();
     }
 
     @Test
     public void should_successfully_pass_Trace_Id_via_rest_template() {
-        // setup:
-//		warm_up_the_environment(() -> check_brewery(CommunicationType.REST_TEMPLATE));
         // given:
         check_brewery(CommunicationType.REST_TEMPLATE);
     }
 
     @Disabled("TODO: Waiting for new release of OpenFeign")
     @Test
     public void should_successfully_pass_Trace_Id_via_feign() {
-        // setup:
-//		warm_up_the_environment(() -> check_brewery(CommunicationType.FEIGN));
         // given:
         check_brewery(CommunicationType.FEIGN);
     }

acceptance-tests/src/test/groovy/io/spring/cloud/samples/brewery/acceptance/ServiceDiscoveryAcceptanceTests.java

@@ -20,8 +20,6 @@ public void before() {
 
     @Test
     public void should_successfully_pass_Trace_Id_via_rest_template() {
-        // setup:
-//		warm_up_the_environment(() -> check_brewery(CommunicationType.REST_TEMPLATE));
         // given:
         check_brewery(CommunicationType.REST_TEMPLATE);
     }

acceptance-tests/src/test/groovy/io/spring/cloud/samples/brewery/acceptance/common/tech/TestConditions.groovy

@@ -31,6 +31,12 @@ class TestConditions {
 		Assumptions.assumeTrue(SERVICE_DISCOVERY())
 	}
 
+	static void assumeNotWavefront() {
+		assumeSystemPropIsValid()
+		String whatToTest = getAndLogWhatToTestSystemProp()
+		Assumptions.assumeFalse(whatToTest.equalsIgnoreCase(WhatToTest.WAVEFRONT.name()))
+	}
+
 	static void assumeSystemPropIsValid() {
 		Assumptions.assumeTrue(whatToTestSystemPropMatchesAny(WhatToTest.values().toList()))
 	}

docker-compose-WAVEFRONT.sh

@@ -45,21 +45,21 @@ if [[ "${READY_FOR_TESTS}" == "no" ]] ; then
     exit 1
 fi
 
+export WAVEFRONT_API_TOKEN="${WAVEFRONT_API_TOKEN:-}"
+export WAVEFRONT_URI="${WAVEFRONT_URI:-https://vmware.wavefront.com}"
+SYSTEM_PROPS="${SYSTEM_PROPS} -Dwavefront.application.name=brewery -Dmanagement.wavefront.api-token=${WAVEFRONT_API_TOKEN} -Dmanagement.wavefront.uri=${WAVEFRONT_URI}"
+
 # Boot config-server
 READY_FOR_TESTS="no"
 PORT_TO_CHECK=8888
 echo "Waiting for the Config Server app to boot for [$(( WAIT_TIME * RETRIES ))] seconds"
-java_jar "config-server"
+java_jar "config-server" "${SYSTEM_PROPS}"
 curl_local_health_endpoint $PORT_TO_CHECK  && READY_FOR_TESTS="yes"
 
 if [[ "${READY_FOR_TESTS}" == "no" ]] ; then
     echo "Config server failed to start..."
     exit 1
 fi
 
-export WAVEFRONT_API_TOKEN="${WAVEFRONT_API_TOKEN}"
-export WAVEFRONT_URI="${WAVEFRONT_URI:-https://vmware.wavefront.com}"
-SYSTEM_PROPS="${SYSTEM_PROPS} -Dwavefront.application.name=brewery -Dmanagement.wavefront.api-token=${WAVEFRONT_API_TOKEN} -Dmanagement.wavefront.uri=${WAVEFRONT_URI}"
-
 echo -e "\n\nStarting brewery apps..."
 start_brewery_apps "$SYSTEM_PROPS"

runAcceptanceTests.sh

@@ -72,12 +72,15 @@ function curl_local_health_endpoint() {
 function java_jar() {
 	local APP_JAVA_PATH=$1/target
 	local EXPRESSION="nohup ${JAVA_PATH_TO_BIN}java $2 $MEM_ARGS -jar $APP_JAVA_PATH/*.jar >$APP_JAVA_PATH/nohup.log &"
-	echo -e "\nTrying to run [$EXPRESSION]"
+	CHANGED_EXPRESSION="${EXPRESSION/${WAVEFRONT_API_TOKEN}/***}"
+	echo -e "\nTrying to run [$CHANGED_EXPRESSION]"
 	eval ${EXPRESSION}
 	pid=$!
 	echo ${pid} >${APP_JAVA_PATH}/app.pid
+	local SYS_PROPS="${2}"
+	CHANGED_SYS_PROPS="${SYS_PROPS/${WAVEFRONT_API_TOKEN}/***}"
 	echo -e "[$1] process pid is [$pid]"
-	echo -e "System props are [$2]"
+	echo -e "System props are [$CHANGED_SYS_PROPS]"
 	echo -e "Logs are under [target/$1.log] or from nohup [$APP_JAVA_PATH/nohup.log]\n"
 	return 0
 }