diff options
author | gjoranv <gv@verizonmedia.com> | 2019-06-11 17:02:37 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-06-11 17:17:39 +0200 |
commit | cbbb7fee23052f78295e2687f153903422add9e2 (patch) | |
tree | a2676bbbcf121d4e49adcb890af4f10073daabf3 /metrics-proxy/src/main | |
parent | 97f82e3fe82e21693cb788e6c406ccede1253fb4 (diff) |
Refactoring only
Diffstat (limited to 'metrics-proxy/src/main')
4 files changed, 8 insertions, 15 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metrics.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metrics.java index ca611368730..2a803062b5d 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metrics.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/Metrics.java @@ -30,7 +30,6 @@ public class Metrics { private void ensureNotFrozen() { if (isFrozen) throw new IllegalStateException("Frozen Metrics cannot be modified!"); - } public long getTimeStamp() { diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java index 9094ef22c20..81358041502 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java @@ -25,8 +25,6 @@ import java.util.logging.Logger; public abstract class HttpMetricFetcher { private final static Logger log = Logger.getLogger(HttpMetricFetcher.class.getPackage().getName()); public final static String STATE_PATH = "/state/v1/"; - final static String METRICS_PATH = STATE_PATH + "metrics"; - final static String HEALTH_PATH = STATE_PATH + "health"; // The call to apache will do 3 retries. As long as we check the services in series, we can't have this too high. public static int CONNECTION_TIMEOUT = 5000; private final static int SOCKET_TIMEOUT = 60000; diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteHealthMetricFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteHealthMetricFetcher.java index 503f582a827..16f4a5cf05b 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteHealthMetricFetcher.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteHealthMetricFetcher.java @@ -18,13 +18,10 @@ import java.util.logging.Logger; * @author Jo Kristian Bergum */ public class RemoteHealthMetricFetcher extends HttpMetricFetcher { - private final static Logger log = Logger.getLogger(RemoteHealthMetricFetcher.class.getPackage().getName()); - /** - * @param service The service to fetch metrics from - * @param port The port to use - */ + private final static String HEALTH_PATH = STATE_PATH + "health"; + public RemoteHealthMetricFetcher(VespaService service, int port) { super(service, port, HEALTH_PATH); } @@ -45,7 +42,7 @@ public class RemoteHealthMetricFetcher extends HttpMetricFetcher { /** * Connect to remote service over http and fetch metrics */ - HealthMetric createHealthMetrics(String data, int fetchCount) { + private HealthMetric createHealthMetrics(String data, int fetchCount) { HealthMetric healthMetric = HealthMetric.getFailed("Failed fetching status page for service"); try { healthMetric = parse(data); diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteMetricsFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteMetricsFetcher.java index a606ec7d8cd..552b4dc4010 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteMetricsFetcher.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteMetricsFetcher.java @@ -25,10 +25,9 @@ import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId; * @author Jo Kristian Bergum */ public class RemoteMetricsFetcher extends HttpMetricFetcher { - /** - * @param service The service to fetch metrics from - * @param port The port to use - */ + + final static String METRICS_PATH = STATE_PATH + "metrics"; + RemoteMetricsFetcher(VespaService service, int port) { super(service, port, METRICS_PATH); } @@ -50,7 +49,7 @@ public class RemoteMetricsFetcher extends HttpMetricFetcher { /** * Connect to remote service over http and fetch metrics */ - public Metrics createMetrics(String data, int fetchCount) { + Metrics createMetrics(String data, int fetchCount) { Metrics remoteMetrics = new Metrics(); try { remoteMetrics = parse(data); @@ -61,7 +60,7 @@ public class RemoteMetricsFetcher extends HttpMetricFetcher { return remoteMetrics; } - Metrics parse(String data) throws JSONException { + private Metrics parse(String data) throws JSONException { JSONObject o = new JSONObject(data); if (!(o.has("metrics"))) { return new Metrics(); //empty |