feat: add evaluation duration

datreeio · May 1, 2022 · d212830 · d212830
1 parent a18dac8
commit d212830
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/bl/evaluation/evaluator.go b/bl/evaluation/evaluator.go
@@ -67,6 +67,7 @@ type EvaluationRequestData struct {
 	FailedYamlFiles    []string
 	FailedK8sFiles     []string
 	PolicyCheckResults FailedRulesByFiles
+	EvaluationDuration float64
 }
 
 var OSInfoFn = NewOSInfo
@@ -79,11 +80,12 @@ func (e *Evaluator) SendEvaluationResult(evaluationRequestData EvaluationRequest
 		Token:      evaluationRequestData.Token,
 		PolicyName: evaluationRequestData.PolicyName,
 		Metadata: &cliClient.Metadata{
-			CliVersion:      evaluationRequestData.CliVersion,
-			Os:              osInfo.OS,
-			PlatformVersion: osInfo.PlatformVersion,
-			KernelVersion:   osInfo.KernelVersion,
-			CIContext:       evaluationRequestData.CiContext,
+			CliVersion:         evaluationRequestData.CliVersion,
+			Os:                 osInfo.OS,
+			PlatformVersion:    osInfo.PlatformVersion,
+			KernelVersion:      osInfo.KernelVersion,
+			CIContext:          evaluationRequestData.CiContext,
+			EvaluationDuration: evaluationRequestData.EvaluationDuration,
 		},
 		FailedYamlFiles:    evaluationRequestData.FailedYamlFiles,
 		FailedK8sFiles:     evaluationRequestData.FailedK8sFiles,

diff --git a/bl/evaluation/evaluator_test.go b/bl/evaluation/evaluator_test.go
@@ -86,6 +86,7 @@ func TestSendEvaluationResult(t *testing.T) {
 			FailedYamlFiles:    []string{},
 			FailedK8sFiles:     []string{},
 			PolicyCheckResults: nil,
+			EvaluationDuration: 0,
 		}
 
 		sendEvaluationResultsResponse, _ := evaluator.SendEvaluationResult(evaluationRequestData)
@@ -96,11 +97,12 @@ func TestSendEvaluationResult(t *testing.T) {
 			Token:      evaluationRequestData.Token,
 			PolicyName: evaluationRequestData.PolicyName,
 			Metadata: &cliClient.Metadata{
-				CliVersion:      evaluationRequestData.CliVersion,
-				Os:              osInfo.OS,
-				PlatformVersion: osInfo.PlatformVersion,
-				KernelVersion:   osInfo.KernelVersion,
-				CIContext:       evaluationRequestData.CiContext,
+				CliVersion:         evaluationRequestData.CliVersion,
+				Os:                 osInfo.OS,
+				PlatformVersion:    osInfo.PlatformVersion,
+				KernelVersion:      osInfo.KernelVersion,
+				CIContext:          evaluationRequestData.CiContext,
+				EvaluationDuration: evaluationRequestData.EvaluationDuration,
 			},
 			FailedYamlFiles:    evaluationRequestData.FailedYamlFiles,
 			FailedK8sFiles:     evaluationRequestData.FailedK8sFiles,

diff --git a/cmd/test/main.go b/cmd/test/main.go
@@ -9,6 +9,7 @@ import (
 	"regexp"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/datreeio/datree/bl/evaluation"
 	"github.com/datreeio/datree/bl/files"
@@ -406,6 +407,7 @@ type EvaluationResultData struct {
 }
 
 func evaluate(ctx *TestCommandContext, filesPaths []string, prerunData *TestCommandData) (EvaluationResultData, error) {
+	startEvaluationTime := time.Now()
 	isInteractiveMode := !evaluation.IsFormattedOutputOption(prerunData.Output)
 
 	var _spinner *spinner.Spinner
@@ -495,7 +497,8 @@ func evaluate(ctx *TestCommandContext, filesPaths []string, prerunData *TestComm
 	}
 
 	ciContext := ciContext.Extract()
-
+	endEvaluationTime := time.Now()
+	evaluationDuration := endEvaluationTime.Sub(startEvaluationTime).Seconds()
 	evaluationRequestData := evaluation.EvaluationRequestData{
 		Token:              prerunData.Token,
 		ClientId:           prerunData.ClientId,
@@ -508,7 +511,9 @@ func evaluate(ctx *TestCommandContext, filesPaths []string, prerunData *TestComm
 		FailedYamlFiles:    failedYamlFiles,
 		FailedK8sFiles:     failedK8sFiles,
 		PolicyCheckResults: policyCheckResultData.RawResults,
+		EvaluationDuration: evaluationDuration,
 	}
+
 	sendEvaluationResultsResponse, err := ctx.Evaluator.SendEvaluationResult(evaluationRequestData)
 
 	if err != nil {

diff --git a/pkg/cliClient/evaluation.go b/pkg/cliClient/evaluation.go
@@ -10,11 +10,12 @@ import (
 )
 
 type Metadata struct {
-	CliVersion      string               `json:"cliVersion"`
-	Os              string               `json:"os"`
-	PlatformVersion string               `json:"platformVersion"`
-	KernelVersion   string               `json:"kernelVersion"`
-	CIContext       *ciContext.CIContext `json:"ciContext"`
+	CliVersion         string               `json:"cliVersion"`
+	Os                 string               `json:"os"`
+	PlatformVersion    string               `json:"platformVersion"`
+	KernelVersion      string               `json:"kernelVersion"`
+	CIContext          *ciContext.CIContext `json:"ciContext"`
+	EvaluationDuration float64              `json:"evaluationDuration"`
 }
 
 type SendEvaluationResultsResponse struct {