OM-209 - review feedback

internal/pkg/statprocessors/sp_latency.go

@@ -51,26 +51,23 @@ func (lw *LatencyStatsProcessor) getLatenciesCommands(rawMetrics map[string]stri
 	// re-repl is auto-enabled, but not coming as part of latencies: list, hence we are adding it explicitly
 	//
 	// Hashmap content format := namespace-<histogram-key> = <0/1>
-	for latencyHistName := range LatencyBenchmarks {
-		nsName := strings.Split(latencyHistName, "~")[0]
-		stat := LatencyBenchmarks[latencyHistName]
+	for nsName, nsLatencies := range NamespaceLatencyBenchmarks {
 
-		histCommand := "latencies:hist="
+		for stat := range nsLatencies {
+			histCommand := "latencies:hist="
 
-		// service-enable-benchmarks-fabric or ns-enable-benchmarks-ops-sub or service-enable-hist-info or service-enable-hist-proxy
-		if nsName != "service" {
+			// service-enable-benchmarks-fabric or ns-enable-benchmarks-ops-sub or service-enable-hist-info or service-enable-hist-proxy
 			histCommand = histCommand + "{" + nsName + "}-"
-		}
-		if strings.Contains(stat, "enable-") {
-			stat = strings.ReplaceAll(stat, "enable-", "")
-		}
-		if strings.Contains(stat, "hist-") {
-			stat = strings.ReplaceAll(stat, "hist-", "")
-		}
-
-		histCommand = histCommand + stat
+			if strings.Contains(stat, "enable-") {
+				stat = strings.ReplaceAll(stat, "enable-", "")
+			}
+			if strings.Contains(stat, "hist-") {
+				stat = strings.ReplaceAll(stat, "hist-", "")
+			}
 
-		commands = append(commands, histCommand)
+			histCommand = histCommand + stat
+			commands = append(commands, histCommand)
+		}
 	}
 
 	log.Tracef("latency-getLatenciesCommands:%s", commands)

internal/pkg/statprocessors/sp_namespaces.go

@@ -233,16 +233,16 @@ func (nw *NamespaceStatsProcessor) refreshNamespaceStats(singleInfoKey string, i
 		// check and if latency benchmarks stat - is it enabled (bool true==1 and false==0 after conversion)
 		if isStatLatencyHistRelated(stat) {
 			// remove old value as microbenchmark may get enabled / disable on-the-fly at server so we cannot rely on value
-			delete(LatencyBenchmarks, nsName+"~"+stat)
+			delete(NamespaceLatencyBenchmarks[nsName], stat)
 
 			if pv == 1 {
-				LatencyBenchmarks[nsName+"~"+stat] = stat
+				NamespaceLatencyBenchmarks[nsName][stat] = stat
 			}
 		}
 
 	}
 	// append default re-repl, as this auto-enabled, but not coming as part of latencies, we need this as namespace is available only here
-	LatencyBenchmarks[nsName+"~latency-hist-re-repl"] = "re-repl"
+	NamespaceLatencyBenchmarks[nsName]["re-repl"] = "re-repl"
 
 	return nsMetricsToSend
 }

internal/pkg/statprocessors/sp_node_stats.go

@@ -88,10 +88,10 @@ func (sw *NodeStatsProcessor) handleRefresh(nodeRawMetrics string) []AerospikeSt
 		if isStatLatencyHistRelated(stat) {
 
 			// remove old value as microbenchmark may get enabled / disable on-the-fly at server so we cannot rely on value
-			delete(LatencyBenchmarks, "service~"+stat)
+			delete(NodeLatencyBenchmarks, stat)
 
 			if pv == 1 {
-				LatencyBenchmarks["service~"+stat] = stat
+				NodeLatencyBenchmarks[stat] = stat
 			}
 		}
 	}

internal/pkg/statprocessors/statsprocessor.go

@@ -5,7 +5,8 @@ var (
 	Service, ClusterName, Build string
 )
 
-var LatencyBenchmarks = make(map[string]string)
+var NodeLatencyBenchmarks = make(map[string]string)
+var NamespaceLatencyBenchmarks = make(map[string]map[string]string)
 
 type StatProcessor interface {
 	PassOneKeys() []string