TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 111 Pull requests 3 Projects Releases 2 Activity Actions

[#9999] pilorama: Add IO tag label to metrics
Some checks failed
DCO action / DCO (pull_request) Successful in 41s
Details
Vulncheck / Vulncheck (pull_request) Successful in 51s
Details
Tests and linters / Run gofumpt (pull_request) Successful in 1m6s
Details
Build / Build Components (pull_request) Successful in 1m25s
Details
Pre-commit hooks / Pre-commit (pull_request) Successful in 1m25s
Details
Tests and linters / Lint (pull_request) Failing after 1m45s
Details
Tests and linters / Tests (pull_request) Successful in 2m8s
Details
Tests and linters / Staticcheck (pull_request) Successful in 2m8s
Details
Tests and linters / gopls check (pull_request) Successful in 2m48s
Details
Tests and linters / Tests with -race (pull_request) Successful in 3m11s
Details

Browse source 
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2025-02-18 14:00:18 +03:00
parent d884558b2e
commit 03445cdef6
Signed by: dstepanov-yadro
GPG key ID: 237AF1A763293BC0
4 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/metrics/pilorama.go
View file

@ -13,7 +13,7 @@ type PiloramaMetrics interface {
SetMode(shardID string, m mode.ComponentMode) SetMode(shardID string, m mode.ComponentMode)
Close(shardID string) Close(shardID string)
AddMethodDuration(shardID string, method string, d time.Duration, success bool) AddMethodDuration(shardID string, method string, d time.Duration, success bool, ioTag string)
} }
func newPiloramaMetrics() *piloramaMetrics { func newPiloramaMetrics() *piloramaMetrics {
@ -24,7 +24,7 @@ func newPiloramaMetrics() *piloramaMetrics {
Subsystem: piloramaSubSystem, Subsystem: piloramaSubSystem,
Name: "request_duration_seconds", Name: "request_duration_seconds",
Help: "Accumulated Pilorama request process duration", Help: "Accumulated Pilorama request process duration",
}, []string{shardIDLabel, successLabel, methodLabel}), }, []string{shardIDLabel, successLabel, methodLabel, ioTagLabel}),
} }
} }
@ -37,11 +37,12 @@ func (m *piloramaMetrics) SetMode(shardID string, mode mode.ComponentMode) {
m.mode.SetMode(shardID, mode.String()) m.mode.SetMode(shardID, mode.String())
} }
func (m *piloramaMetrics) AddMethodDuration(shardID string, method string, d time.Duration, success bool) { func (m *piloramaMetrics) AddMethodDuration(shardID string, method string, d time.Duration, success bool, ioTag string) {
m.reqDuration.With(prometheus.Labels{ m.reqDuration.With(prometheus.Labels{
shardIDLabel: shardID, shardIDLabel: shardID,
successLabel: strconv.FormatBool(success), successLabel: strconv.FormatBool(success),
methodLabel: method, methodLabel: method,
ioTagLabel: ioTag,
}).Observe(d.Seconds()) }).Observe(d.Seconds())
} }

4
pkg/local_object_storage/metrics/pilorama.go
View file

@ -32,6 +32,6 @@ func (m *piloramaMetrics) Close() {
m.m.Close(m.shardID) m.m.Close(m.shardID)
} }
func (m *piloramaMetrics) AddMethodDuration(method string, d time.Duration, success bool) { func (m *piloramaMetrics) AddMethodDuration(method string, d time.Duration, success bool, ioTag string) {
m.m.AddMethodDuration(m.shardID, method, d, success) m.m.AddMethodDuration(m.shardID, method, d, success, ioTag)
} }

31
pkg/local_object_storage/pilorama/boltdb.go
View file

@ -14,6 +14,7 @@ import (
"sync" "sync"
"time" "time"
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/qos"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/metaerr"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr"
@ -259,7 +260,7 @@ func (t *boltForest) TreeExists(ctx context.Context, cid cidSDK.ID, treeID strin
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeExists", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeExists", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeExists", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeExists",
@ -297,7 +298,7 @@ func (t *boltForest) TreeUpdateLastSyncHeight(ctx context.Context, cid cidSDK.ID
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeUpdateLastSyncHeight", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeUpdateLastSyncHeight", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeUpdateLastSyncHeight", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeUpdateLastSyncHeight",
@ -333,7 +334,7 @@ func (t *boltForest) TreeLastSyncHeight(ctx context.Context, cid cidSDK.ID, tree
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeLastSyncHeight", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeLastSyncHeight", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeLastSyncHeight", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeLastSyncHeight",
@ -371,7 +372,7 @@ func (t *boltForest) TreeAddByPath(ctx context.Context, d CIDDescriptor, treeID
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeAddByPath", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeAddByPath", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeAddByPath", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeAddByPath",
@ -489,7 +490,7 @@ func (t *boltForest) TreeApply(ctx context.Context, cnr cidSDK.ID, treeID string
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeApply", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeApply", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeApply", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeApply",
@ -561,7 +562,7 @@ func (t *boltForest) TreeApplyBatch(ctx context.Context, cnr cidSDK.ID, treeID s
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeApplyBatch", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeApplyBatch", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeApplyBatch", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeApplyBatch",
@ -636,7 +637,7 @@ func (t *boltForest) TreeApplyStream(ctx context.Context, cnr cidSDK.ID, treeID
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeApplyStream", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeApplyStream", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeApplyStream", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeApplyStream",
@ -937,7 +938,7 @@ func (t *boltForest) TreeGetByPath(ctx context.Context, cid cidSDK.ID, treeID st
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeGetByPath", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeGetByPath", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeGetByPath", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeGetByPath",
@ -1017,7 +1018,7 @@ func (t *boltForest) TreeGetMeta(ctx context.Context, cid cidSDK.ID, treeID stri
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeGetMeta", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeGetMeta", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeGetMeta", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeGetMeta",
@ -1083,7 +1084,7 @@ func (t *boltForest) TreeSortedByFilename(ctx context.Context, cid cidSDK.ID, tr
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeSortedByFilename", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeSortedByFilename", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeSortedByFilename", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeSortedByFilename",
@ -1253,7 +1254,7 @@ func (t *boltForest) TreeGetChildren(ctx context.Context, cid cidSDK.ID, treeID
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeGetChildren", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeGetChildren", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeGetChildren", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeGetChildren",
@ -1318,7 +1319,7 @@ func (t *boltForest) TreeList(ctx context.Context, cid cidSDK.ID) ([]string, err
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeList", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeList", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeList", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeList",
@ -1367,7 +1368,7 @@ func (t *boltForest) TreeGetOpLog(ctx context.Context, cid cidSDK.ID, treeID str
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeGetOpLog", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeGetOpLog", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeGetOpLog", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeGetOpLog",
@ -1414,7 +1415,7 @@ func (t *boltForest) TreeDrop(ctx context.Context, cid cidSDK.ID, treeID string)
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeDrop", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeDrop", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeDrop", _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeDrop",
@ -1465,7 +1466,7 @@ func (t *boltForest) TreeListTrees(ctx context.Context, prm TreeListTreesPrm) (*
success = false success = false
) )
defer func() { defer func() {
t.metrics.AddMethodDuration("TreeListTrees", time.Since(startedAt), success) t.metrics.AddMethodDuration("TreeListTrees", time.Since(startedAt), success, qos.IOTagStringFromContext(ctx))
}() }()
_, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeListTrees") _, span := tracing.StartSpanFromContext(ctx, "boltForest.TreeListTrees")

10
pkg/local_object_storage/pilorama/metrics.go
View file

@ -12,12 +12,12 @@ type Metrics interface {
SetMode(m mode.ComponentMode) SetMode(m mode.ComponentMode)
Close() Close()
AddMethodDuration(method string, d time.Duration, success bool) AddMethodDuration(method string, d time.Duration, success bool, ioTag string)
} }
type noopMetrics struct{} type noopMetrics struct{}
func (m *noopMetrics) SetParentID(string) {} func (m *noopMetrics) SetParentID(string) {}
func (m *noopMetrics) SetMode(mode.ComponentMode) {} func (m *noopMetrics) SetMode(mode.ComponentMode) {}
func (m *noopMetrics) Close() {} func (m *noopMetrics) Close() {}
func (m *noopMetrics) AddMethodDuration(string, time.Duration, bool) {} func (m *noopMetrics) AddMethodDuration(string, time.Duration, bool, string) {}