Merge pull request #246 from sdslabs/application-metrics-fix

Application metrics fix and make issues

Author: mhk19

scripts/build/install_fresh.sh

@@ -11,7 +11,7 @@ printf "🔨 Installing fresh\n"
 mkdir -p bin
 tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX)
 cd $tmp_dir
-GOPATH=$tmp_dir go get github.com/pilu/fresh
+GOPATH=$tmp_dir go install github.com/pilu/fresh@latest
 cp $tmp_dir/bin/fresh $project_dir/bin/fresh
 rm -rf $tmp_dir
 

scripts/build/install_golint.sh

@@ -11,7 +11,7 @@ printf "🔨 Installing golint\n"
 mkdir -p bin
 tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX)
 cd $tmp_dir
-GOPATH=$tmp_dir go get golang.org/x/lint/golint
+GOPATH=$tmp_dir go install golang.org/x/lint/golint@latest
 cp $tmp_dir/bin/golint $project_dir/bin/golint
 rm -rf $tmp_dir
 

services/master/controllers/application.go

@@ -237,6 +237,7 @@ func FetchMetrics(c *gin.Context) {
 	appName := c.Param("app")
 	filter := utils.QueryToFilter(c.Request.URL.Query())
 	var timeSpan int64
+	var sparsity int64
 	for unit, converter := range timeConversionMap {
 		if val, ok := filter[unit].(string); ok {
 			timeVal, err := strconv.ParseInt(val, 10, 64)
@@ -254,12 +255,25 @@ func FetchMetrics(c *gin.Context) {
 		},
 	}, -1)
 
-	sparsity := timeConversionMap[filter["sparsity"].(string)]
+	// handle empty metrics
+	if len(metrics) == 0 {
+		c.JSON(200, types.M{
+			"success": true,
+			"data":    []types.M{},
+		})
+		return
+	}
+
+	if val, ok := filter["sparsityvalue"].(string); ok {
+		sparsityVal, err := strconv.ParseInt(val, 10, 64)
+		if err != nil {
+			sparsity = sparsityVal * timeConversionMap[filter["sparsityunit"].(string)]
+		}
+	}
 
 	uptimeRecord := []bool{}
 	CPURecord := []float64{}
 	memoryRecord := []float64{}
-
 	baseTimestamp := metrics[0]["timestamp"].(int64)
 	var downtimeIntensity int = 0
 	var currTimestamp int64
@@ -277,10 +291,9 @@ func FetchMetrics(c *gin.Context) {
 				uptimeRecord = append(uptimeRecord, true)
 			}
 			downtimeIntensity = 0
+			CPURecord = append(CPURecord, metrics[i]["cpu_usage"].(float64))
+		    memoryRecord = append(memoryRecord, metrics[i]["memory_usage"].(float64))
 		}
-
-		CPURecord = append(CPURecord, metrics[i]["cpu_usage"].(float64))
-		memoryRecord = append(memoryRecord, metrics[i]["memory_usage"].(float64))
 	}
 
 	metricsRecord := metricsRecord{uptimeRecord, CPURecord, memoryRecord}

services/master/routes.go

@@ -70,7 +70,7 @@ func NewService() http.Handler {
 		app.PATCH("/:app/rebuild", m.IsAppOwner, c.RebuildApp)
 		app.PATCH("/:app/transfer/:user", m.IsAppOwner, c.TransferApplicationOwnership)
 		app.GET("/:app/term", m.IsAppOwner, c.DeployWebTerminal)
-		app.GET("/:app/metrics", c.FetchMetrics)
+		app.GET("/:app/metrics", m.IsAppOwner, c.FetchMetrics)
 	}
 
 	db := router.Group("/dbs")