Merge branch 'kubecon-2025' into feat/finops-open-api-v1

Author: Shivam-nagar23

.github/workflows/pr-issue-validator.yaml

@@ -12,6 +12,7 @@ on:
       - 'release-**'
       - 'develop'
       - 'hotfix-**'
+      - 'kubecon-**'
     # paths-ignore:
     #   - 'docs/**'
     #   - '.github/'
@@ -42,4 +43,4 @@ jobs:
       run: |
         wget https://raw.githubusercontent.com/devtron-labs/utilities/feat/central-pr-validator/.github/workflows/validateIssue.sh
         chmod +x validateIssue.sh
-        ./validateIssue.sh 
+        ./validateIssue.sh 

common-lib/utils/TimeUtils.go

@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2024. Devtron Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package utils
 
 import (
@@ -9,7 +25,7 @@ import (
 type TimeRangeRequest struct {
 	From       *time.Time   `json:"from" schema:"from"`
 	To         *time.Time   `json:"to" schema:"to"`
-	TimeWindow *TimeWindows `json:"timeWindow" schema:"timeWindow" validate:"omitempty,oneof=today yesterday week month quarter lastWeek lastMonth"`
+	TimeWindow *TimeWindows `json:"timeWindow" schema:"timeWindow" validate:"omitempty,oneof=today yesterday week month quarter lastWeek lastMonth lastQuarter last7Days last30Days last90Days"`
 }
 
 func NewTimeRangeRequest(from *time.Time, to *time.Time) *TimeRangeRequest {
@@ -34,14 +50,18 @@ func (timeRange TimeWindows) String() string {
 
 // Define constants for different time windows
 const (
-	Today     TimeWindows = "today"
-	Yesterday TimeWindows = "yesterday"
-	Week      TimeWindows = "week"
-	Month     TimeWindows = "month"
-	Quarter   TimeWindows = "quarter"
-	LastWeek  TimeWindows = "lastWeek"
-	LastMonth TimeWindows = "lastMonth"
-	Year      TimeWindows = "year"
+	Today       TimeWindows = "today"
+	Yesterday   TimeWindows = "yesterday"
+	Week        TimeWindows = "week"
+	Month       TimeWindows = "month"
+	Quarter     TimeWindows = "quarter"
+	LastWeek    TimeWindows = "lastWeek"
+	LastMonth   TimeWindows = "lastMonth"
+	Year        TimeWindows = "year"
+	LastQuarter TimeWindows = "lastQuarter"
+	Last7Days   TimeWindows = "last7Days"
+	Last30Days  TimeWindows = "last30Days"
+	Last90Days  TimeWindows = "last90Days"
 )
 
 func (timeRange *TimeRangeRequest) ParseAndValidateTimeRange() (*TimeRangeRequest, error) {
@@ -89,9 +109,49 @@ func (timeRange *TimeRangeRequest) ParseAndValidateTimeRange() (*TimeRangeReques
 			lastMonthStart := thisMonthStart.AddDate(0, -1, 0)
 			lastMonthEnd := thisMonthStart.Add(-time.Second)
 			return NewTimeRangeRequest(&lastMonthStart, &lastMonthEnd), nil
+		case LastQuarter:
+			// Calculate current quarter
+			currentQuarter := ((int(now.Month()) - 1) / 3) + 1
+
+			// Calculate previous quarter
+			var prevQuarter int
+			var prevYear int
+			if currentQuarter == 1 {
+				// If current quarter is Q1, previous quarter is Q4 of previous year
+				prevQuarter = 4
+				prevYear = now.Year() - 1
+			} else {
+				// Otherwise, previous quarter is in the same year
+				prevQuarter = currentQuarter - 1
+				prevYear = now.Year()
+			}
+
+			// Calculate start and end of previous quarter
+			prevQuarterStartMonth := time.Month((prevQuarter-1)*3 + 1)
+			prevQuarterStart := time.Date(prevYear, prevQuarterStartMonth, 1, 0, 0, 0, 0, now.Location())
+
+			// End of previous quarter is the start of current quarter minus 1 second
+			currentQuarterStartMonth := time.Month((currentQuarter-1)*3 + 1)
+			currentQuarterStart := time.Date(now.Year(), currentQuarterStartMonth, 1, 0, 0, 0, 0, now.Location())
+			if currentQuarter == 1 {
+				// If current quarter is Q1, we need to calculate Q4 end of previous year
+				currentQuarterStart = time.Date(now.Year(), time.January, 1, 0, 0, 0, 0, now.Location())
+			}
+			prevQuarterEnd := currentQuarterStart.Add(-time.Second)
+
+			return NewTimeRangeRequest(&prevQuarterStart, &prevQuarterEnd), nil
 		case Year:
 			start := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, now.Location())
 			return NewTimeRangeRequest(&start, &now), nil
+		case Last7Days:
+			start := now.AddDate(0, 0, -7)
+			return NewTimeRangeRequest(&start, &now), nil
+		case Last30Days:
+			start := now.AddDate(0, 0, -30)
+			return NewTimeRangeRequest(&start, &now), nil
+		case Last90Days:
+			start := now.AddDate(0, 0, -90)
+			return NewTimeRangeRequest(&start, &now), nil
 		default:
 			return NewTimeRangeRequest(&time.Time{}, &time.Time{}), fmt.Errorf("unsupported time window: %q", *timeRange.TimeWindow)
 		}

lens/api/RestHandler.go

@@ -18,14 +18,18 @@ package api
 
 import (
 	"encoding/json"
-	"github.com/devtron-labs/lens/pkg"
-	"go.uber.org/zap"
+	"fmt"
 	"net/http"
 	"strconv"
+
+	"github.com/devtron-labs/lens/internal/dto"
+	"github.com/devtron-labs/lens/pkg"
+	"go.uber.org/zap"
 )
 
 type RestHandler interface {
 	GetDeploymentMetrics(w http.ResponseWriter, r *http.Request)
+	GetBulkDeploymentMetrics(w http.ResponseWriter, r *http.Request)
 	ProcessDeploymentEvent(w http.ResponseWriter, r *http.Request)
 	ResetApplication(w http.ResponseWriter, r *http.Request)
 }
@@ -104,7 +108,7 @@ func (impl *RestHandlerImpl) GetDeploymentMetrics(w http.ResponseWriter, r *http
 	//decoder := json.NewDecoder(r.Body)
 	v := r.URL.Query()
 	impl.logger.Infow("metrics request", "req", v)
-	metricRequest := &pkg.MetricRequest{}
+	metricRequest := &dto.MetricRequest{}
 	if v.Get("env_id") != "" {
 		envId, err := strconv.Atoi(v.Get("env_id"))
 		if err != nil {
@@ -141,6 +145,35 @@ func (impl *RestHandlerImpl) GetDeploymentMetrics(w http.ResponseWriter, r *http
 	impl.writeJsonResp(w, err, metrics, 200)
 }
 
+func (impl *RestHandlerImpl) GetBulkDeploymentMetrics(w http.ResponseWriter, r *http.Request) {
+	decoder := json.NewDecoder(r.Body)
+	bulkRequest := &dto.BulkMetricRequest{}
+
+	err := decoder.Decode(bulkRequest)
+	if err != nil {
+		impl.logger.Error("error decoding bulk request", "err", err)
+		impl.writeJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+
+	impl.logger.Infow("bulk metrics request", "req", bulkRequest)
+
+	// Validate request
+	if len(bulkRequest.AppEnvPairs) == 0 {
+		impl.writeJsonResp(w, fmt.Errorf("app_env_pairs cannot be empty"), nil, http.StatusBadRequest)
+		return
+	}
+
+	if bulkRequest.From == nil || bulkRequest.To == nil {
+		impl.writeJsonResp(w, fmt.Errorf("from and to dates are required"), nil, http.StatusBadRequest)
+		return
+	}
+
+	bulkMetrics, err := impl.deploymentMetricService.ProcessBulkDoraMetrics(bulkRequest)
+	impl.logger.Infof("bulk metrics response: %+v", bulkMetrics)
+	impl.writeJsonResp(w, err, bulkMetrics, 200)
+}
+
 func (impl *RestHandlerImpl) ProcessDeploymentEvent(w http.ResponseWriter, r *http.Request) {
 	decoder := json.NewDecoder(r.Body)
 	deploymentEvent := &pkg.DeploymentEvent{}

lens/api/Router.go

@@ -18,10 +18,11 @@ package api
 
 import (
 	"encoding/json"
+	"net/http"
+
 	"github.com/gorilla/mux"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"go.uber.org/zap"
-	"net/http"
 )
 
 type MuxRouter struct {
@@ -54,6 +55,7 @@ func (r MuxRouter) Init() {
 	r.Router.Path("/deployment-metrics").HandlerFunc(r.restHandler.GetDeploymentMetrics).
 		Queries("app_id", "{app_id}", "env_id", "{env_id}", "from", "{from}", "to", "{to}").
 		Methods("GET", "OPTIONS")
+	r.Router.Path("/deployment-metrics/bulk").HandlerFunc(r.restHandler.GetBulkDeploymentMetrics).Methods("GET", "OPTIONS")
 	r.Router.Path("/new-deployment-event").HandlerFunc(r.restHandler.ProcessDeploymentEvent).Methods("POST")
 	r.Router.Path("/reset-app-environment").HandlerFunc(r.restHandler.ResetApplication).Methods("POST")
 

lens/internal/dto/deploymentMetricsDto.go

@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2024. Devtron Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dto
+
+import (
+	"time"
+)
+
+type Metrics struct {
+	Series                 []*Metric `json:"series"`
+	AverageCycleTime       float64   `json:"average_cycle_time"`
+	AverageLeadTime        float64   `json:"average_lead_time"`
+	ChangeFailureRate      float64   `json:"change_failure_rate"`
+	AverageRecoveryTime    float64   `json:"average_recovery_time"`
+	AverageDeploymentSize  float32   `json:"average_deployment_size"`
+	AverageLineAdded       float32   `json:"average_line_added"`
+	AverageLineDeleted     float32   `json:"average_line_deleted"`
+	LastFailedTime         string    `json:"last_failed_time"`
+	RecoveryTimeLastFailed float64   `json:"recovery_time_last_failed"`
+}
+
+type Metric struct {
+	ReleaseType           ReleaseType   `json:"release_type"`
+	ReleaseStatus         ReleaseStatus `json:"release_status"`
+	ReleaseTime           time.Time     `json:"release_time"`
+	ChangeSizeLineAdded   int           `json:"change_size_line_added"`
+	ChangeSizeLineDeleted int           `json:"change_size_line_deleted"`
+	DeploymentSize        int           `json:"deployment_size"`
+	CommitHash            string        `json:"commit_hash"`
+	CommitTime            time.Time     `json:"commit_time"`
+	LeadTime              float64       `json:"lead_time"`
+	CycleTime             float64       `json:"cycle_time"`
+	RecoveryTime          float64       `json:"recovery_time"`
+}
+
+type MetricRequest struct {
+	AppId int    `json:"app_id"`
+	EnvId int    `json:"env_id"`
+	From  string `json:"from"`
+	To    string `json:"to"`
+}
+
+type AppEnvPair struct {
+	AppId int `json:"appId"`
+	EnvId int `json:"envId"`
+}
+
+type BulkMetricRequest struct {
+	AppEnvPairs []AppEnvPair `json:"appEnvPairs"`
+	From        *time.Time   `json:"from"`
+	To          *time.Time   `json:"to"`
+}
+
+type AppEnvMetrics struct {
+	AppId   int      `json:"appId"`
+	EnvId   int      `json:"envId"`
+	Metrics *Metrics `json:"metrics"`
+	Error   string   `json:"error,omitempty"`
+}
+
+type BulkMetricsResponse struct {
+	Results []AppEnvMetrics `json:"results"`
+}
+
+// ----------------
+type ReleaseType int
+
+const (
+	Unknown ReleaseType = iota
+	RollForward
+	RollBack
+	Patch
+)
+
+func (releaseType ReleaseType) String() string {
+	return [...]string{"Unknown", "RollForward", "RollBack", "Patch"}[releaseType]
+}
+
+// --------------
+type ReleaseStatus int
+
+const (
+	Success ReleaseStatus = iota
+	Failure
+)
+
+func (releaseStatus ReleaseStatus) String() string {
+	return [...]string{"Success", "Failure"}[releaseStatus]
+}
+
+// ------
+type ProcessStage int
+
+const (
+	Init ProcessStage = iota
+	ReleaseTypeDetermined
+	LeadTimeFetch
+)
+
+func (ProcessStage ProcessStage) String() string {
+	return [...]string{"Init", "ReleaseTypeDetermined", "LeadTimeFetch"}[ProcessStage]
+}