Add: Display branchwise activity statistics

routebuildermdl/routebuildermdl.go

@@ -101,7 +101,7 @@ func executeServiceWithBranch(name, branch string, data []byte, isRestricted, is
 		serviceCache.preHooksExec(&rs, &principalObj)
 		go serviceCache.Service(&rs, principalObj)
 		servingTime := time.Since(start)
-		go statemdl.UpdateServiceState(name, servingTime, serviceError, isRestricted, isRoleBased)
+		go statemdl.UpdateServiceStateWithBranch(name, branch, servingTime, serviceError, isRestricted, isRoleBased)
 		return asyncToken, nil, isCompressed, errormdl.NOERROR, nil
 	}
 	rs := gjson.ParseBytes(data)
@@ -112,7 +112,7 @@ func executeServiceWithBranch(name, branch string, data []byte, isRestricted, is
 
 	servingTime := time.Since(start)
 	// Record State for every service
-	go statemdl.UpdateServiceState(name, servingTime, serviceError, isRestricted, isRoleBased)
+	go statemdl.UpdateServiceStateWithBranch(name, branch, servingTime, serviceError, isRestricted, isRoleBased)
 
 	if serviceError == nil {
 		serviceCache.postHooksExec(result, &principalObj)

statemdl/state.go

@@ -29,6 +29,7 @@ type Statistic struct {
 	Description  string        `json:"description"`
 	IsRestricted bool          `json:"isRestricted"`
 	IsRoleBased  bool          `json:"isRoleBased"`
+	Branch       string        `json:"branch"` // Only applicable to activity stats
 }
 
 type groupResponse struct {
@@ -196,17 +197,34 @@ func updateGroupCache(hitCount int64) {
 
 // UpdateServiceState - update entry of service in state map
 func UpdateServiceState(serviceName string, servingTime time.Duration, serviceError error, isRestricted, isRoleBased bool) {
+	UpdateServiceStateWithBranch(serviceName, "main", servingTime, serviceError, isRestricted, isRoleBased)
+}
+
+func concatenateNameWithBranch(name, branch string) string {
+	if branch == "" {
+		return name + "_main"
+	}
+
+	return name + "_" + branch
+}
+
+// UpdateServiceStateWithBranch - update entry of service from a branch in state map
+func UpdateServiceStateWithBranch(serviceName, branch string, servingTime time.Duration, serviceError error, isRestricted, isRoleBased bool) {
 	if !initStatus {
 		return
 	}
 	stateMutex.Lock()
-	serviceState, ok := stateCache[serviceName]
+
+	key := concatenateNameWithBranch(serviceName, branch)
+
+	serviceState, ok := stateCache[key]
 	if !ok {
 		serviceState = Statistic{
 			ServiceName:  serviceName,
 			Name:         serviceName,
 			IsRestricted: isRestricted,
 			IsRoleBased:  isRoleBased,
+			Branch:       branch,
 		}
 	}
 	serviceState.TotalHits++
@@ -224,7 +242,7 @@ func UpdateServiceState(serviceName string, servingTime time.Duration, serviceEr
 			serviceState.MinTime = servingTime
 		}
 	}
-	stateCache[serviceName] = serviceState
+	stateCache[key] = serviceState
 	stateMutex.Unlock()
 	updateGlobalHit()
 }