Merge branch 'release-candidate-v0.36.0' into drain-node-fix

Author: prkhrkat

client/telemetry/TelemetryEventClient.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 	cloudProviderIdentifier "github.com/devtron-labs/common-lib/cloud-provider-identifier"
 	posthogTelemetry "github.com/devtron-labs/common-lib/telemetry"
@@ -690,8 +691,13 @@ func (impl *TelemetryEventClientImpl) checkForOptOut(ctx context.Context, UCID s
 	if err != nil {
 		// this should be non-blocking call and should not fail the request for ucid getting
 		impl.logger.Errorw("check opt-out list failed, rest api error", "ucid", UCID, "err", err)
+		return false, err
+	}
+	flag, ok := response["result"].(bool)
+	if !ok {
+		impl.logger.Errorw("check opt-out list failed, type assertion error", "ucid", UCID)
+		return false, errors.New("type assertion error")
 	}
-	flag := response["result"].(bool)
 	return flag, nil
 }
 

pkg/app/AppService.go

@@ -555,11 +555,7 @@ func (impl *AppServiceImpl) UpdatePipelineStatusTimelineForApplicationChanges(ap
 		if err != nil {
 			impl.logger.Errorw("error in save/update pipeline status fetch detail", "err", err, "cdWfrId", runnerHistoryId)
 		}
-		syncStartTime, found := helper.GetSyncStartTime(app)
-		if !found {
-			impl.logger.Warnw("sync operation not started yet", "app", app)
-			return isTimelineUpdated, isTimelineTimedOut, kubectlApplySyncedTimeline, fmt.Errorf("sync operation not started yet")
-		}
+		syncStartTime := helper.GetSyncStartTime(app, statusTime)
 		// creating cd pipeline status timeline
 		timeline := &pipelineConfig.PipelineStatusTimeline{
 			CdWorkflowRunnerId: runnerHistoryId,
@@ -596,11 +592,7 @@ func (impl *AppServiceImpl) UpdatePipelineStatusTimelineForApplicationChanges(ap
 			timeline.Id = 0
 			timeline.Status = timelineStatus.TIMELINE_STATUS_KUBECTL_APPLY_SYNCED
 			timeline.StatusDetail = app.Status.OperationState.Message
-			syncFinishTime, found := helper.GetSyncFinishTime(app)
-			if !found {
-				impl.logger.Warnw("sync operation not found for the deployment", "app", app)
-				return isTimelineUpdated, isTimelineTimedOut, kubectlApplySyncedTimeline, fmt.Errorf("sync operation not found for the deployment")
-			}
+			syncFinishTime := helper.GetSyncFinishTime(app, statusTime)
 			timeline.StatusTime = syncFinishTime
 			// checking and saving if this timeline is present or not because kubewatch may stream same objects multiple times
 			err = impl.pipelineStatusTimelineService.SaveTimeline(timeline, nil)
@@ -679,11 +671,7 @@ func (impl *AppServiceImpl) UpdatePipelineStatusTimelineForApplicationChanges(ap
 		if err != nil {
 			impl.logger.Errorw("error in save/update pipeline status fetch detail", "err", err, "installedAppVersionHistoryId", runnerHistoryId)
 		}
-		syncStartTime, found := helper.GetSyncStartTime(app)
-		if !found {
-			impl.logger.Warnw("sync operation not started yet", "app", app)
-			return isTimelineUpdated, isTimelineTimedOut, kubectlApplySyncedTimeline, fmt.Errorf("sync operation not started yet")
-		}
+		syncStartTime := helper.GetSyncStartTime(app, statusTime)
 		// creating installedAppVersionHistory status timeline
 		timeline := &pipelineConfig.PipelineStatusTimeline{
 			InstalledAppVersionHistoryId: runnerHistoryId,
@@ -720,11 +708,7 @@ func (impl *AppServiceImpl) UpdatePipelineStatusTimelineForApplicationChanges(ap
 			timeline.Id = 0
 			timeline.Status = timelineStatus.TIMELINE_STATUS_KUBECTL_APPLY_SYNCED
 			timeline.StatusDetail = app.Status.OperationState.Message
-			syncFinishTime, found := helper.GetSyncFinishTime(app)
-			if !found {
-				impl.logger.Warnw("sync operation not found for the deployment", "app", app)
-				return isTimelineUpdated, isTimelineTimedOut, kubectlApplySyncedTimeline, fmt.Errorf("sync operation not found for the deployment")
-			}
+			syncFinishTime := helper.GetSyncFinishTime(app, statusTime)
 			timeline.StatusTime = syncFinishTime
 			// checking and saving if this timeline is present or not because kubewatch may stream same objects multiple times
 			err = impl.pipelineStatusTimelineService.SaveTimeline(timeline, nil)
@@ -744,6 +728,7 @@ func (impl *AppServiceImpl) UpdatePipelineStatusTimelineForApplicationChanges(ap
 				haveNewTimeline = true
 				timeline.Status = timelineStatus.TIMELINE_STATUS_APP_HEALTHY
 				timeline.StatusDetail = "App status is Healthy."
+				timeline.StatusTime = statusTime
 			}
 			if haveNewTimeline {
 				// not checking if this status is already present or not because already checked for terminal status existence earlier

pkg/argoApplication/helper/deploymentStatusHelper.go

@@ -2,41 +2,40 @@ package helper
 
 import (
 	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"time"
 )
 
 // GetSyncStartTime assumes that it is always called for calculating start time of latest git hash
-func GetSyncStartTime(app *v1alpha1.Application) (time.Time, bool) {
+func GetSyncStartTime(app *v1alpha1.Application, defaultStartTime time.Time) time.Time {
+	startTime := metav1.NewTime(defaultStartTime)
+	// FIXME: this should be the git hash of the latest PCO
 	gitHash := app.Status.Sync.Revision
-	if app.Status.OperationState != nil &&
-		app.Status.OperationState.Operation.Sync != nil &&
-		app.Status.OperationState.Operation.Sync.Revision == gitHash {
-		return app.Status.OperationState.StartedAt.Time, true
-	} else if len(app.Status.History) != 0 {
-		if app.Status.History.LastRevisionHistory().Revision == gitHash &&
-			app.Status.History.LastRevisionHistory().DeployStartedAt != nil {
-			startTime := *app.Status.History.LastRevisionHistory().DeployStartedAt
-			return startTime.Time, true
+	if app.Status.OperationState != nil {
+		startTime = app.Status.OperationState.StartedAt
+	} else if app.Status.History != nil {
+		for _, history := range app.Status.History {
+			if history.Revision == gitHash {
+				startTime = *history.DeployStartedAt
+			}
 		}
 	}
-	return time.Time{}, false
+	return startTime.Time
 }
 
 // GetSyncFinishTime assumes that it is always called for calculating finish time of latest git hash
-func GetSyncFinishTime(app *v1alpha1.Application) (time.Time, bool) {
+func GetSyncFinishTime(app *v1alpha1.Application, defaultEndTime time.Time) time.Time {
+	finishTime := metav1.NewTime(defaultEndTime)
+	// FIXME: this should be the git hash of the latest PCO
 	gitHash := app.Status.Sync.Revision
-	if app.Status.OperationState != nil &&
-		app.Status.OperationState.Operation.Sync != nil &&
-		app.Status.OperationState.Operation.Sync.Revision == gitHash &&
-		app.Status.OperationState.FinishedAt != nil {
-		finishTime := *app.Status.OperationState.FinishedAt
-		return finishTime.Time, true
-	} else if len(app.Status.History) != 0 {
-		if app.Status.History.LastRevisionHistory().Revision == gitHash &&
-			app.Status.History.LastRevisionHistory().DeployStartedAt != nil {
-			finishTime := *app.Status.History.LastRevisionHistory().DeployStartedAt
-			return finishTime.Time, true
+	if app.Status.OperationState != nil && app.Status.OperationState.FinishedAt != nil {
+		finishTime = *app.Status.OperationState.FinishedAt
+	} else if app.Status.History != nil {
+		for _, history := range app.Status.History {
+			if history.Revision == gitHash {
+				finishTime = history.DeployedAt
+			}
 		}
 	}
-	return time.Time{}, false
+	return finishTime.Time
 }