Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

Trim default metrics #1086

Merged
merged 4 commits into from Mar 12, 2019
Merged

Trim default metrics #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d60273e
Trim default metrics
shemnon Mar 12, 2019
4144490
Merge branch 'master' into metrics
shemnon Mar 12, 2019
19c898b
fix import
shemnon Mar 12, 2019
4b7f928
Merge remote-tracking branch 'origin/metrics' into metrics
shemnon Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion metrics/src/main/java/tech/pegasys/pantheon/metrics/MetricCategory.java
View file
Open in desktop
Expand Up @@ -27,8 +27,9 @@ public enum MetricCategory {
RPC("rpc"),
SYNCHRONIZER("synchronizer");

// Why not BIG_QUEUE and ROCKSDB? They hurt performance under load.
public static final Set<MetricCategory> DEFAULT_METRIC_CATEGORIES =
EnumSet.allOf(MetricCategory.class);
EnumSet.complementOf(EnumSet.of(BIG_QUEUE, ROCKSDB));

private final String name;
private final boolean pantheonSpecific;
Expand Down
5 changes: 3 additions & 2 deletions metrics/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsConfiguration.java
View file
Open in desktop
Expand Up @@ -12,12 +12,13 @@
*/
package tech.pegasys.pantheon.metrics.prometheus;

import static tech.pegasys.pantheon.metrics.MetricCategory.DEFAULT_METRIC_CATEGORIES;

import tech.pegasys.pantheon.metrics.MetricCategory;

import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Objects;
import java.util.Set;

Expand Down Expand Up @@ -46,7 +47,7 @@ public static MetricsConfiguration createDefault() {
metricsConfiguration.setEnabled(false);
metricsConfiguration.setPort(DEFAULT_METRICS_PORT);
metricsConfiguration.setHost(DEFAULT_METRICS_HOST);
metricsConfiguration.setMetricCategories(EnumSet.allOf(MetricCategory.class));
metricsConfiguration.setMetricCategories(DEFAULT_METRIC_CATEGORIES);
metricsConfiguration.setPushEnabled(false);
metricsConfiguration.setPushPort(DEFAULT_METRICS_PUSH_PORT);
metricsConfiguration.setPushHost(DEFAULT_METRICS_PUSH_HOST);
Expand Down