duration and count of deployments working

Signed-off-by: odubajDT <[email protected]>
keptn · Oct 5, 2022 · f2c101b · f2c101b
1 parent 5c483aa
commit f2c101b
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 12 deletions.
diff --git a/operator/api/v1alpha1/keptntask_types.go b/operator/api/v1alpha1/keptntask_types.go
@@ -17,6 +17,8 @@ limitations under the License.
 package v1alpha1
 
 import (
+	"time"
+
 	"github.com/keptn-sandbox/lifecycle-controller/operator/api/v1alpha1/common"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -45,8 +47,10 @@ type SecureParameters struct {
 
 // KeptnTaskStatus defines the observed state of KeptnTask
 type KeptnTaskStatus struct {
-	JobName string            `json:"jobName,omitempty"`
-	Status  common.KeptnState `json:"status,omitempty"`
+	JobName   string            `json:"jobName,omitempty"`
+	Status    common.KeptnState `json:"status,omitempty"`
+	StartTime time.Time         `json:"startTime,omitempty"`
+	EndTime   time.Time         `json:"endTime,omitempty"`
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 }
@@ -80,3 +84,15 @@ type KeptnTaskList struct {
 func init() {
 	SchemeBuilder.Register(&KeptnTask{}, &KeptnTaskList{})
 }
+
+func (i KeptnTask) SetStartTime() {
+	if i.Status.StartTime.IsZero() {
+		i.Status.StartTime = time.Now().UTC()
+	}
+}
+
+func (i KeptnTask) SetEndTime() {
+	if i.Status.EndTime.IsZero() {
+		i.Status.EndTime = time.Now().UTC()
+	}
+}
diff --git a/operator/api/v1alpha1/keptnworkloadinstance_types.go b/operator/api/v1alpha1/keptnworkloadinstance_types.go
@@ -17,6 +17,8 @@ limitations under the License.
 package v1alpha1
 
 import (
+	"time"
+
 	"github.com/keptn-sandbox/lifecycle-controller/operator/api/v1alpha1/common"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -40,12 +42,16 @@ type KeptnWorkloadInstanceStatus struct {
 	PostDeploymentStatus     common.KeptnState    `json:"postDeploymentStatus,omitempty"`
 	PreDeploymentTaskStatus  []WorkloadTaskStatus `json:"preDeploymentTaskStatus,omitempty"`
 	PostDeploymentTaskStatus []WorkloadTaskStatus `json:"postDeploymentTaskStatus,omitempty"`
+	StartTime                time.Time            `json:"startTime,omitempty"`
+	EndTime                  time.Time            `json:"endTime,omitempty"`
 }
 
 type WorkloadTaskStatus struct {
 	TaskDefinitionName string            `json:"TaskDefinitionName,omitempty"`
 	Status             common.KeptnState `json:"status,omitempty"`
 	TaskName           string            `json:"taskName,omitempty"`
+	StartTime          time.Time         `json:"startTime,omitempty"`
+	EndTime            time.Time         `json:"endTime,omitempty"`
 }
 
 //+kubebuilder:object:root=true
@@ -90,3 +96,27 @@ func (i KeptnWorkloadInstance) IsPostDeploymentCompleted() bool {
 func (i KeptnWorkloadInstance) IsDeploymentCompleted() bool {
 	return i.Status.DeploymentStatus.IsCompleted()
 }
+
+func (i KeptnWorkloadInstance) SetStartTime() {
+	if i.Status.StartTime.IsZero() {
+		i.Status.StartTime = time.Now().UTC()
+	}
+}
+
+func (i KeptnWorkloadInstance) SetEndTime() {
+	if i.Status.EndTime.IsZero() {
+		i.Status.EndTime = time.Now().UTC()
+	}
+}
+
+func (i WorkloadTaskStatus) SetStartTime() {
+	if i.StartTime.IsZero() {
+		i.StartTime = time.Now().UTC()
+	}
+}
+
+func (i WorkloadTaskStatus) SetEndTime() {
+	if i.EndTime.IsZero() {
+		i.EndTime = time.Now().UTC()
+	}
+}
diff --git a/operator/controllers/keptnworkload/controller.go b/operator/controllers/keptnworkload/controller.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	"go.opentelemetry.io/otel/attribute"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -129,14 +128,5 @@ func (r *KeptnWorkloadReconciler) createWorkloadInstance(ctx context.Context, wo
 		r.Log.Error(err, "could not set controller reference for WorkloadInstance: "+workloadInstance.Name)
 	}
 
-	// metrics: increment deployment counter
-	attrs := []attribute.KeyValue{
-		attribute.Key("KeptnApp").String(workloadInstance.Spec.AppName),
-		attribute.Key("KeptnWorkload").String(workloadInstance.Spec.WorkloadName),
-		attribute.Key("KeptnVersion").String(workloadInstance.Spec.Version),
-		attribute.Key("Namespace").String(workloadInstance.Namespace),
-	}
-	r.Meters.DeploymentCount.Add(ctx, 1, attrs...)
-
 	return workloadInstance, err
 }
diff --git a/operator/controllers/keptnworkloadinstance/controller.go b/operator/controllers/keptnworkloadinstance/controller.go
@@ -91,6 +91,8 @@ func (r *KeptnWorkloadInstanceReconciler) Reconcile(ctx context.Context, req ctr
 		return reconcile.Result{}, fmt.Errorf("could not fetch KeptnWorkloadInstance: %+v", err)
 	}
 
+	workloadInstance.SetStartTime()
+
 	if !workloadInstance.IsPreDeploymentCompleted() {
 		r.Log.Info("Pre deployment checks not finished")
 		err := r.reconcilePreDeployment(ctx, req, workloadInstance)
@@ -121,6 +123,23 @@ func (r *KeptnWorkloadInstanceReconciler) Reconcile(ctx context.Context, req ctr
 		return ctrl.Result{Requeue: true, RequeueAfter: 5 * time.Second}, nil
 	}
 
+	workloadInstance.SetEndTime()
+
+	attrs := []attribute.KeyValue{
+		attribute.Key("KeptnApp").String(workloadInstance.Spec.AppName),
+		attribute.Key("KeptnWorkload").String(workloadInstance.Spec.WorkloadName),
+		attribute.Key("KeptnVersion").String(workloadInstance.Spec.Version),
+		attribute.Key("Namespace").String(workloadInstance.Namespace),
+		attribute.Key("Status").String(string(workloadInstance.Status.PostDeploymentStatus)),
+	}
+
+	// metrics: increment deployment counter
+	r.Meters.DeploymentCount.Add(ctx, 1, attrs...)
+
+	// metrics: add deployment duration
+	duration := workloadInstance.Status.EndTime.Sub(workloadInstance.Status.StartTime)
+	r.Meters.DeploymentDuration.Record(ctx, duration.Seconds(), attrs...)
+
 	return ctrl.Result{}, nil
 }