[metric_storage] Metric storage group expire (#676)

Signed-off-by: Mikhail Scherba <[email protected]>
flant · Nov 1, 2024 · e643dff · e643dff
1 parent 7bde4c5
commit e643dff
Show file tree

Hide file tree

Showing 5 changed files with 394 additions and 15 deletions.
diff --git a/pkg/metric/grouped_storage_mock.go b/pkg/metric/grouped_storage_mock.go
diff --git a/pkg/metric/storage.go b/pkg/metric/storage.go
@@ -28,6 +28,7 @@ type Storage interface {
 type GroupedStorage interface {
 	Registerer() prometheus.Registerer
 	ExpireGroupMetrics(group string)
+	ExpireGroupMetricByName(group, name string)
 	GetOrCreateCounterCollector(name string, labelNames []string) (*ConstCounterCollector, error)
 	GetOrCreateGaugeCollector(name string, labelNames []string) (*ConstGaugeCollector, error)
 	CounterAdd(group string, name string, value float64, labels map[string]string)

diff --git a/pkg/metric_storage/metric_storage.go b/pkg/metric_storage/metric_storage.go
@@ -55,10 +55,10 @@ func NewMetricStorage(ctx context.Context, prefix string, newRegistry bool) *Met
 		Counters:         make(map[string]*prometheus.CounterVec),
 		Histograms:       make(map[string]*prometheus.HistogramVec),
 		HistogramBuckets: make(map[string][]float64),
-		groupedVault:     vault.NewGroupedVault(),
 		Gatherer:         prometheus.DefaultGatherer,
 		Registerer:       prometheus.DefaultRegisterer,
 	}
+	m.groupedVault = vault.NewGroupedVault(m.resolveMetricName)
 	m.groupedVault.SetRegisterer(m.Registerer)
 
 	if newRegistry {