[shell-operator] Add default group to every hook (#777)

Signed-off-by: Pavel Okhlopkov <pavel.okhlopkov@flant.com>

Author: ldmonster

pkg/hook/hook.go

@@ -175,7 +175,7 @@ func (h *Hook) Run(ctx context.Context, _ htypes.BindingType, context []bctx.Bin
 		return result, fmt.Errorf("%s FAILED: %s", h.Name, err)
 	}
 
-	result.Metrics, err = operation.MetricOperationsFromFile(metricsPath)
+	result.Metrics, err = operation.MetricOperationsFromFile(metricsPath, h.Name)
 	if err != nil {
 		return result, fmt.Errorf("got bad metrics: %s", err)
 	}

pkg/metric_storage/operation/operation.go

@@ -56,7 +56,7 @@ func (m MetricOperation) String() string {
 	return "[" + strings.Join(parts, ", ") + "]"
 }
 
-func MetricOperationsFromReader(r io.Reader) ([]MetricOperation, error) {
+func MetricOperationsFromReader(r io.Reader, defaultGroup string) ([]MetricOperation, error) {
 	operations := make([]MetricOperation, 0)
 
 	dec := json.NewDecoder(r)
@@ -73,22 +73,27 @@ func MetricOperationsFromReader(r io.Reader) ([]MetricOperation, error) {
 			metricOperation.Action = "set"
 			metricOperation.Value = metricOperation.Set
 		}
+
 		if metricOperation.Add != nil && metricOperation.Set == nil {
 			metricOperation.Action = "add"
 			metricOperation.Value = metricOperation.Add
 		}
 
+		if metricOperation.Group == "" {
+			metricOperation.Group = defaultGroup
+		}
+
 		operations = append(operations, metricOperation)
 	}
 
 	return operations, nil
 }
 
-func MetricOperationsFromBytes(data []byte) ([]MetricOperation, error) {
-	return MetricOperationsFromReader(bytes.NewReader(data))
+func MetricOperationsFromBytes(data []byte, defaultGroup string) ([]MetricOperation, error) {
+	return MetricOperationsFromReader(bytes.NewReader(data), defaultGroup)
 }
 
-func MetricOperationsFromFile(filePath string) ([]MetricOperation, error) {
+func MetricOperationsFromFile(filePath, defaultGroup string) ([]MetricOperation, error) {
 	data, err := os.ReadFile(filePath)
 	if err != nil {
 		return nil, fmt.Errorf("cannot read %s: %s", filePath, err)
@@ -97,7 +102,7 @@ func MetricOperationsFromFile(filePath string) ([]MetricOperation, error) {
 	if len(data) == 0 {
 		return nil, nil
 	}
-	return MetricOperationsFromBytes(data)
+	return MetricOperationsFromBytes(data, defaultGroup)
 }
 
 func ValidateOperations(ops []MetricOperation) error {

pkg/metric_storage/operation/operation_test.go

@@ -39,7 +39,7 @@ func Test_ValidateMetricOperations(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			g := NewWithT(t)
 
-			ops, err := MetricOperationsFromBytes([]byte(tt.op))
+			ops, err := MetricOperationsFromBytes([]byte(tt.op), "")
 			g.Expect(err).ShouldNot(HaveOccurred())
 
 			err = ValidateOperations(ops)

pkg/metric_storage/vault/vault.go

@@ -2,6 +2,7 @@ package vault
 
 import (
 	"fmt"
+	"log/slog"
 	"sync"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
@@ -67,9 +68,11 @@ func (v *GroupedVault) GetOrCreateCounterCollector(name string, labelNames []str
 	} else if !IsSubset(collector.LabelNames(), labelNames) {
 		collector.UpdateLabels(labelNames)
 	}
+
 	if counter, ok := collector.(*metric.ConstCounterCollector); ok {
 		return counter, nil
 	}
+
 	return nil, fmt.Errorf("counter %v collector requested, but %s %v collector exists", labelNames, collector.Type(), collector.LabelNames())
 }
 
@@ -98,18 +101,34 @@ func (v *GroupedVault) CounterAdd(group string, name string, value float64, labe
 	metricName := v.resolveMetricNameFunc(name)
 	c, err := v.GetOrCreateCounterCollector(metricName, LabelNames(labels))
 	if err != nil {
-		log.Error("CounterAdd", log.Err(err))
+		log.Error(
+			"CounterAdd",
+			slog.String("group", group),
+			slog.String("name", name),
+			slog.Any("labels", labels),
+			log.Err(err),
+		)
+
 		return
 	}
+
 	c.Add(group, value, labels)
 }
 
 func (v *GroupedVault) GaugeSet(group string, name string, value float64, labels map[string]string) {
 	metricName := v.resolveMetricNameFunc(name)
 	c, err := v.GetOrCreateGaugeCollector(metricName, LabelNames(labels))
 	if err != nil {
-		log.Error("GaugeSet", log.Err(err))
+		log.Error(
+			"GaugeSet",
+			slog.String("group", group),
+			slog.String("name", name),
+			slog.Any("labels", labels),
+			log.Err(err),
+		)
+
 		return
 	}
+
 	c.Set(group, value, labels)
 }