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

Add Metric Labels to Metric Names #121

Merged
merged 8 commits into from
Apr 29, 2022
Merged

Add Metric Labels to Metric Names #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
69ca352
adding metric labels to counter
shaynafinocchiaro Apr 27, 2022
86ca51e
Update actions.yml
shaynafinocchiaro Apr 27, 2022
d2059d3
Update actions.yml
shaynafinocchiaro Apr 27, 2022
f9049ff
Update actions.yml
shaynafinocchiaro Apr 27, 2022
c25dce0
Update actions.yml
shaynafinocchiaro Apr 27, 2022
2755774
Update actions.yml
shaynafinocchiaro Apr 27, 2022
e6febb5
Update actions.yml
shaynafinocchiaro Apr 27, 2022
3484a36
Update actions.yml
shaynafinocchiaro Apr 27, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Checkout the code
uses: actions/checkout@v2
- name: Install Mockgen
run: go get github.com/golang/mock/[email protected]
run: go install github.com/golang/mock/[email protected]
- name: Get dependencies
run: go mod download
- name: Build csm-metrics-powerflex Docker Image
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.17

require (
github.com/dell/goscaleio v1.6.0
github.com/fsnotify/fsnotify v1.5.1
github.com/fsnotify/fsnotify v1.5.3
github.com/golang/mock v1.6.0
github.com/sirupsen/logrus v1.8.1
github.com/spf13/viper v1.10.1
Expand All @@ -14,7 +14,7 @@ require (
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.26.0
go.opentelemetry.io/otel/metric v0.26.0
go.opentelemetry.io/otel/sdk/metric v0.26.0
google.golang.org/grpc v1.44.0
google.golang.org/grpc v1.46.0
k8s.io/api v0.23.3
k8s.io/apimachinery v0.23.3
k8s.io/client-go v0.23.3
Expand Down
8 changes: 5 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m
github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
Expand All @@ -133,8 +134,9 @@ github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoD
github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
github.com/fsnotify/fsnotify v1.5.3 h1:vNFpj2z7YIbwh2bw7x35sqYpp2wfuq+pivKbWG09B8c=
github.com/fsnotify/fsnotify v1.5.3/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
Expand Down Expand Up @@ -877,8 +879,8 @@ google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K
google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.44.0 h1:weqSxi/TMs1SqFRMHCtBgXRs8k3X39QIDEZ0pRcttUg=
google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8=
google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
Expand Down
20 changes: 10 additions & 10 deletions internal/service/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ func (mw *MetricsWrapper) Record(ctx context.Context, meta interface{},

metrics := metricsMapValue.(*Metrics)

metrics.ReadBW.Add(ctx, readBW)
metrics.WriteBW.Add(ctx, writeBW)
metrics.ReadIOPS.Add(ctx, readIOPS)
metrics.WriteIOPS.Add(ctx, writeIOPS)
metrics.ReadLatency.Add(ctx, readLatency)
metrics.WriteLatency.Add(ctx, writeLatency)
metrics.ReadBW.Add(ctx, readBW, labels...)
metrics.WriteBW.Add(ctx, writeBW, labels...)
metrics.ReadIOPS.Add(ctx, readIOPS, labels...)
metrics.WriteIOPS.Add(ctx, writeIOPS, labels...)
metrics.ReadLatency.Add(ctx, readLatency, labels...)
metrics.WriteLatency.Add(ctx, writeLatency, labels...)

return nil
}
Expand Down Expand Up @@ -259,10 +259,10 @@ func (mw *MetricsWrapper) RecordCapacity(ctx context.Context, meta interface{},

metrics := metricsMapValue.(*CapacityMetrics)

metrics.TotalLogicalCapacity.Add(ctx, totalLogicalCapacity)
metrics.LogicalCapacityAvailable.Add(ctx, logicalCapacityAvailable)
metrics.LogicalCapacityInUse.Add(ctx, logicalCapacityInUse)
metrics.LogicalProvisioned.Add(ctx, logicalProvisioned)
metrics.TotalLogicalCapacity.Add(ctx, totalLogicalCapacity, labels...)
metrics.LogicalCapacityAvailable.Add(ctx, logicalCapacityAvailable, labels...)
metrics.LogicalCapacityInUse.Add(ctx, logicalCapacityInUse, labels...)
metrics.LogicalProvisioned.Add(ctx, logicalProvisioned, labels...)
}
}
default:
Expand Down