Enhance JMeter result message (#3685)

* Added better message for JMeter result Signed-off-by: mishraprafful <prafful.mishra@volvocars.com> * Updated function calls for sendFinishedEvent Signed-off-by: mishraprafful <prafful.mishra@volvocars.com> * Added DNS resolution check for serviceUrl Signed-off-by: mishraprafful <prafful.mishra@volvocars.com> * Assinging varibales to DNS lookup result Signed-off-by: mishraprafful <prafful.mishra@volvocars.com> * Changed function call for Finished test Event post DNS Url check Signed-off-by: mishraprafful <prafful.mishra@volvocars.com> * Added meaningful test finishing message Signed-off-by: mishraprafful <prafful.mishra@volvocars.com> * Fixed variable overriding Signed-off-by: mishraprafful <prafful.mishra@volvocars.com>
keptn · Apr 7, 2021 · 78b89c1 · 78b89c1
1 parent 6131d1b
commit 78b89c1
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/jmeter-service/main.go b/jmeter-service/main.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"net"
 	"net/url"
 	"os"
 	"strconv"
@@ -99,6 +100,17 @@ func runTests(event cloudevents.Event, shkeptncontext string, data keptnv2.TestT
 	var res bool
 	healthCheckWorkload, err = getWorkload(jmeterconf, TestStrategy_HealthCheck)
 	if healthCheckWorkload != nil {
+
+		_ , err := net.LookupIP(serviceUrl.String())
+		if err != nil {
+			msg := fmt.Sprintf("Jmeter-service cannot reach URL %s", serviceUrl)
+			logger.Error(msg)
+			if err := sendTestsFinishedEvent(shkeptncontext, event, startedAt, msg, keptnv2.ResultFailed, logger); err != nil {
+				logger.Error(fmt.Sprintf("Error sending test finished event: %s", err.Error()) + ". " + testInfo.ToString())
+			}
+			return
+		}
+
 		res, err = runWorkload(serviceUrl, testInfo, healthCheckWorkload, logger)
 		if err != nil {
 			msg := fmt.Sprintf("could not run test workload: %s", err.Error())
@@ -110,7 +122,8 @@ func runTests(event cloudevents.Event, shkeptncontext string, data keptnv2.TestT
 		}
 
 		if !res {
-			if err := sendTestsFinishedEvent(shkeptncontext, event, startedAt, keptnv2.ResultFailed, logger); err != nil {
+			msg := fmt.Sprintf("Tests for %s with status = %s.%s", TestStrategy_HealthCheck, strconv.FormatBool(res), testInfo.ToString())
+			if err := sendTestsFinishedEvent(shkeptncontext, event, startedAt, msg, keptnv2.ResultFailed, logger); err != nil {
 				logger.Error(fmt.Sprintf("Error sending test finished event: %s", err.Error()) + ". " + testInfo.ToString())
 			}
 			return
@@ -152,14 +165,15 @@ func runTests(event cloudevents.Event, shkeptncontext string, data keptnv2.TestT
 	}
 
 	// now lets send the test finished event
+	msg := fmt.Sprintf("Tests for %s with status = %s.%s", testStrategy, strconv.FormatBool(res), testInfo.ToString())
 	if !res {
-		if err := sendTestsFinishedEvent(shkeptncontext, event, startedAt, keptnv2.ResultFailed, logger); err != nil {
+		if err := sendTestsFinishedEvent(shkeptncontext, event, startedAt, msg, keptnv2.ResultFailed, logger); err != nil {
 			logger.Error(fmt.Sprintf("Error sending test finished event: %s", err.Error()) + ". " + testInfo.ToString())
 		}
 		return
 	}
 
-	if err := sendTestsFinishedEvent(shkeptncontext, event, startedAt, keptnv2.ResultPass, logger); err != nil {
+	if err := sendTestsFinishedEvent(shkeptncontext, event, startedAt, msg, keptnv2.ResultPass, logger); err != nil {
 		logger.Error(fmt.Sprintf("Error sending test finished event: %s", err.Error()) + ". " + testInfo.ToString())
 	}
 }
@@ -242,7 +256,7 @@ func sendTestsStartedEvent(shkeptncontext string, incomingEvent cloudevents.Even
 	return sendEvent(event)
 }
 
-func sendTestsFinishedEvent(shkeptncontext string, incomingEvent cloudevents.Event, startedAt time.Time, result keptnv2.ResultType, logger *keptncommon.Logger) error {
+func sendTestsFinishedEvent(shkeptncontext string, incomingEvent cloudevents.Event, startedAt time.Time, msg string, result keptnv2.ResultType, logger *keptncommon.Logger) error {
 	source, _ := url.Parse("jmeter-service")
 
 	testFinishedData := keptnv2.TestFinishedEventData{}
@@ -259,6 +273,7 @@ func sendTestsFinishedEvent(shkeptncontext string, incomingEvent cloudevents.Eve
 	// set test result
 	testFinishedData.Result = result
 	testFinishedData.Status = keptnv2.StatusSucceeded
+	testFinishedData.Message = msg
 
 	event := cloudevents.NewEvent()
 	event.SetType(keptnv2.GetFinishedEventType(keptnv2.TestTaskName))