Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fileservice: add active reader metrics to object storage #17799

Merged
merged 2 commits into from
Aug 1, 2024
Merged

fileservice: add active reader metrics to object storage #17799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d4a8bd
fileservice: add active reader metrics to object storage
reusee Jul 30, 2024
46a1a54
Merge branch 'main' into moremetrics
mergify[bot] Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions pkg/fileservice/object_storage_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@ import (
type objectStorageMetrics struct {
upstream ObjectStorage

numDelete prometheus.Gauge
numExists prometheus.Gauge
numList prometheus.Gauge
numRead prometheus.Gauge
numStat prometheus.Gauge
numWrite prometheus.Gauge
numDelete prometheus.Gauge
numExists prometheus.Gauge
numList prometheus.Gauge
numRead prometheus.Gauge
numActiveRead prometheus.Gauge
numStat prometheus.Gauge
numWrite prometheus.Gauge
}

func newObjectStorageMetrics(
Expand All @@ -42,43 +43,55 @@ func newObjectStorageMetrics(
return &objectStorageMetrics{
upstream: upstream,

numRead: metric.FSObjectStorageOperations.WithLabelValues(name, "read"),
numWrite: metric.FSObjectStorageOperations.WithLabelValues(name, "write"),
numDelete: metric.FSObjectStorageOperations.WithLabelValues(name, "delete"),
numList: metric.FSObjectStorageOperations.WithLabelValues(name, "list"),
numExists: metric.FSObjectStorageOperations.WithLabelValues(name, "exists"),
numStat: metric.FSObjectStorageOperations.WithLabelValues(name, "stat"),
numRead: metric.FSObjectStorageOperations.WithLabelValues(name, "read"),
numActiveRead: metric.FSObjectStorageOperations.WithLabelValues(name, "active-read"),
numWrite: metric.FSObjectStorageOperations.WithLabelValues(name, "write"),
numDelete: metric.FSObjectStorageOperations.WithLabelValues(name, "delete"),
numList: metric.FSObjectStorageOperations.WithLabelValues(name, "list"),
numExists: metric.FSObjectStorageOperations.WithLabelValues(name, "exists"),
numStat: metric.FSObjectStorageOperations.WithLabelValues(name, "stat"),
}
}

var _ ObjectStorage = new(objectStorageMetrics)

func (o *objectStorageMetrics) Delete(ctx context.Context, keys ...string) (err error) {
o.numDelete.Add(1)
o.numDelete.Inc()
return o.upstream.Delete(ctx, keys...)
}

func (o *objectStorageMetrics) Exists(ctx context.Context, key string) (bool, error) {
o.numExists.Add(1)
o.numExists.Inc()
return o.upstream.Exists(ctx, key)
}

func (o *objectStorageMetrics) List(ctx context.Context, prefix string, fn func(isPrefix bool, key string, size int64) (bool, error)) (err error) {
o.numList.Add(1)
o.numList.Inc()
return o.upstream.List(ctx, prefix, fn)
}

func (o *objectStorageMetrics) Read(ctx context.Context, key string, min *int64, max *int64) (r io.ReadCloser, err error) {
o.numRead.Add(1)
return o.upstream.Read(ctx, key, min, max)
func (o *objectStorageMetrics) Read(ctx context.Context, key string, min *int64, max *int64) (io.ReadCloser, error) {
o.numRead.Inc()
o.numActiveRead.Inc()
r, err := o.upstream.Read(ctx, key, min, max)
if err != nil {
return nil, err
}
return &readCloser{
r: r,
closeFunc: func() error {
o.numActiveRead.Dec()
return r.Close()
},
}, nil
}

func (o *objectStorageMetrics) Stat(ctx context.Context, key string) (size int64, err error) {
o.numStat.Add(1)
o.numStat.Inc()
return o.upstream.Stat(ctx, key)
}

func (o *objectStorageMetrics) Write(ctx context.Context, key string, r io.Reader, size int64, expire *time.Time) (err error) {
o.numWrite.Add(1)
o.numWrite.Inc()
return o.upstream.Write(ctx, key, r, size, expire)
}
4 changes: 4 additions & 0 deletions pkg/util/metric/v2/dashboard/grafana_dashboard_fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ func (c *DashboardCreator) initFSObjectStorageRow() dashboard.Option {
3,
[]string{
c.getMetricWithFilter("mo_fs_object_storage_operations", `name="s3",op="read"`),
c.getMetricWithFilter("mo_fs_object_storage_operations", `name="s3",op="active-read"`),
c.getMetricWithFilter("mo_fs_object_storage_operations", `name="s3",op="write"`),
c.getMetricWithFilter("mo_fs_object_storage_operations", `name="s3",op="delete"`),
c.getMetricWithFilter("mo_fs_object_storage_operations", `name="s3",op="list"`),
Expand All @@ -236,6 +237,7 @@ func (c *DashboardCreator) initFSObjectStorageRow() dashboard.Option {
},
[]string{
"read",
"active-read",
"write",
"delete",
"list",
Expand All @@ -249,6 +251,7 @@ func (c *DashboardCreator) initFSObjectStorageRow() dashboard.Option {
3,
[]string{
`rate(` + c.getMetricWithFilter("mo_fs_object_storage_operations", `name="s3",op="read"`) + `[$interval])`,
`rate(` + c.getMetricWithFilter("mo_fs_object_storage_operations", `name="s3",op="active-read"`) + `[$interval])`,
`rate(` + c.getMetricWithFilter("mo_fs_object_storage_operations", `name="s3",op="write"`) + `[$interval])`,
`rate(` + c.getMetricWithFilter("mo_fs_object_storage_operations", `name="s3",op="delete"`) + `[$interval])`,
`rate(` + c.getMetricWithFilter("mo_fs_object_storage_operations", `name="s3",op="list"`) + `[$interval])`,
Expand All @@ -257,6 +260,7 @@ func (c *DashboardCreator) initFSObjectStorageRow() dashboard.Option {
},
[]string{
"read",
"active-read",
"write",
"delete",
"list",
Expand Down
Loading