This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
Extract MetricsCategory interface #1573
Closed
Conversation
This file contains 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
ajsutton
commented
Jun 18, 2019
| @@ -56,6 +56,6 @@ default void createLongGauge( | |||
| Stream<Observation> streamObservations(MetricCategory category); | |||
|
|
|||
| default Stream<Observation> streamObservations() { | |||
| return Stream.of(MetricCategory.values()).flatMap(this::streamObservations); | |||
| return Stream.of(PantheonMetricCategory.values()).flatMap(this::streamObservations); | |||
There was a problem hiding this comment.
This still ties us to PantheonMetricCategory but will be cleaned up in a follow-up PR. Trying to focus just on the rename in this one.
| @@ -56,7 +59,8 @@ | |||
| private final Map<String, LabelledMetric<tech.pegasys.pantheon.metrics.OperationTimer>> | |||
| cachedTimers = new ConcurrentHashMap<>(); | |||
|
|
|||
| private final EnumSet<MetricCategory> enabledCategories = EnumSet.allOf(MetricCategory.class); | |||
| private final Set<MetricCategory> enabledCategories = | |||
There was a problem hiding this comment.
Need to use a Set instead of EnumSet now.
|
|
||
| import org.junit.Test; | ||
|
|
||
| public class PrometheusMetricsSystemTest { | ||
|
|
||
| private static final Comparator<Observation> IGNORE_VALUES = | ||
| Comparator.comparing(Observation::getCategory) | ||
| Comparator.<Observation, String>comparing(o -> o.getCategory().getName()) |
There was a problem hiding this comment.
Category is no longer an enum so the comparator has to be based off the name instead of the enum ordinal (which is probably a good thing anyway). Not sure why the generics is being difficult but it really wants to be told explicitly.
|
Actually, this was a step too far - the change to an interface requires all the detail. Will just do a simple rename without the enum as the next step. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
PR description
Extract a
MetricCategoryinterface instead of having all categories in a single enum.The vast majority of this is just the rename of the enum to
PantheonMetricCategory.Builds on #1572 but getting it lined up...