-
Notifications
You must be signed in to change notification settings - Fork 555
Add more precise matching to the metric end-to-end tests. #1610
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.
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
Merged
openshift-merge-robot
merged 1 commit into
operator-framework:master
from
benluddy:metrics-test-matcher
Jun 27, 2020
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package e2e | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/onsi/gomega/format" | ||
| "github.com/onsi/gomega/types" | ||
| ) | ||
|
|
||
| type Metric struct { | ||
| Family string | ||
| Labels map[string][]string | ||
| Value float64 // Zero unless type is Untypted, Gauge, or Counter! | ||
| } | ||
|
|
||
| type MetricPredicate struct { | ||
| f func(m Metric) bool | ||
| name string | ||
| } | ||
|
|
||
| func (mp MetricPredicate) String() string { | ||
| return mp.name | ||
| } | ||
|
|
||
| func WithFamily(f string) MetricPredicate { | ||
| return MetricPredicate{ | ||
| name: fmt.Sprintf("WithFamily(%s)", f), | ||
| f: func(m Metric) bool { | ||
| return m.Family == f | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func WithLabel(n, v string) MetricPredicate { | ||
| return MetricPredicate{ | ||
| name: fmt.Sprintf("WithLabel(%s=%s)", n, v), | ||
| f: func(m Metric) bool { | ||
| for name, values := range m.Labels { | ||
| for _, value := range values { | ||
| if name == n && value == v { | ||
| return true | ||
| } | ||
| } | ||
| } | ||
| return false | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func WithValue(v float64) MetricPredicate { | ||
| return MetricPredicate{ | ||
| name: fmt.Sprintf("WithValue(%g)", v), | ||
| f: func(m Metric) bool { | ||
| return m.Value == v | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| type LikeMetricMatcher struct { | ||
| Predicates []MetricPredicate | ||
| } | ||
|
|
||
| func (matcher *LikeMetricMatcher) Match(actual interface{}) (bool, error) { | ||
| metric, ok := actual.(Metric) | ||
| if !ok { | ||
| return false, fmt.Errorf("LikeMetric matcher expects Metric (got %T)", actual) | ||
| } | ||
| for _, predicate := range matcher.Predicates { | ||
| if !predicate.f(metric) { | ||
| return false, nil | ||
| } | ||
| } | ||
| return true, nil | ||
| } | ||
|
|
||
| func (matcher *LikeMetricMatcher) FailureMessage(actual interface{}) string { | ||
| return format.Message(actual, "to satisfy", matcher.Predicates) | ||
| } | ||
|
|
||
| func (matcher *LikeMetricMatcher) NegatedFailureMessage(actual interface{}) string { | ||
| return format.Message(actual, "not to satisfy", matcher.Predicates) | ||
| } | ||
|
|
||
| func LikeMetric(preds ...MetricPredicate) types.GomegaMatcher { | ||
| return &LikeMetricMatcher{ | ||
| Predicates: preds, | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Is there a reason for the snake_case? AFAIK it's not conventional for import aliases.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This package is actually generated by protobuf, so
io_prometheus_clientis its real name. I can sneak in a human-friendly import alias in a separate PR.