From 6c51f48aab6932b035a42f1982a531eed8251174 Mon Sep 17 00:00:00 2001
From: Anton Nikiforov <an.nikiforov@yadro.com>
Date: Mon, 13 Jan 2025 12:52:02 +0300
Subject: [PATCH] [#1596] metrics: Create public aliases for internal `engine`
metrics
Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
---
pkg/local_object_storage/engine/metrics.go | 44 ++++++----------------
1 file changed, 11 insertions(+), 33 deletions(-)
diff --git a/pkg/local_object_storage/engine/metrics.go b/pkg/local_object_storage/engine/metrics.go
index 75936206df..963292d835 100644
--- a/pkg/local_object_storage/engine/metrics.go
+++ b/pkg/local_object_storage/engine/metrics.go
@@ -7,34 +7,12 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
)
-type MetricRegister interface {
- AddMethodDuration(method string, d time.Duration)
-
- SetObjectCounter(shardID, objectType string, v uint64)
- AddToObjectCounter(shardID, objectType string, delta int)
-
- SetMode(shardID string, mode mode.Mode)
-
- AddToContainerSize(cnrID string, size int64)
- DeleteContainerSize(cnrID string)
- DeleteContainerCount(cnrID string)
- AddToPayloadCounter(shardID string, size int64)
- IncErrorCounter(shardID string)
- ClearErrorCounter(shardID string)
- DeleteShardMetrics(shardID string)
-
- SetContainerObjectCounter(shardID, contID, objectType string, v uint64)
- IncContainerObjectCounter(shardID, contID, objectType string)
- SubContainerObjectCounter(shardID, contID, objectType string, v uint64)
-
- IncRefillObjectsCount(shardID, path string, size int, success bool)
- SetRefillPercent(shardID, path string, percent uint32)
- SetRefillStatus(shardID, path, status string)
- SetEvacuationInProgress(shardID string, value bool)
-
- WriteCache() metrics.WriteCacheMetrics
- GC() metrics.GCMetrics
-}
+type (
+ MetricRegister = metrics.EngineMetrics
+ GCMetrics = metrics.GCMetrics
+ WriteCacheMetrics = metrics.WriteCacheMetrics
+ NullBool = metrics.NullBool
+)
func elapsed(method string, addFunc func(method string, d time.Duration)) func() {
t := time.Now()
@@ -76,9 +54,9 @@ type (
)
var (
- _ MetricRegister = noopMetrics{}
- _ metrics.WriteCacheMetrics = noopWriteCacheMetrics{}
- _ metrics.GCMetrics = noopGCMetrics{}
+ _ MetricRegister = noopMetrics{}
+ _ WriteCacheMetrics = noopWriteCacheMetrics{}
+ _ GCMetrics = noopGCMetrics{}
)
func (noopMetrics) AddMethodDuration(string, time.Duration) {}
@@ -99,8 +77,8 @@ func (noopMetrics) IncRefillObjectsCount(string, string, int, bool) {}
func (noopMetrics) SetRefillPercent(string, string, uint32) {}
func (noopMetrics) SetRefillStatus(string, string, string) {}
func (noopMetrics) SetEvacuationInProgress(string, bool) {}
-func (noopMetrics) WriteCache() metrics.WriteCacheMetrics { return noopWriteCacheMetrics{} }
-func (noopMetrics) GC() metrics.GCMetrics { return noopGCMetrics{} }
+func (noopMetrics) WriteCache() WriteCacheMetrics { return noopWriteCacheMetrics{} }
+func (noopMetrics) GC() GCMetrics { return noopGCMetrics{} }
func (noopWriteCacheMetrics) AddMethodDuration(string, string, string, string, bool, time.Duration) {}
func (noopWriteCacheMetrics) SetActualCount(string, string, string, uint64) {}