diff options
Diffstat (limited to 'metrics-proxy/src/test/java')
3 files changed, 24 insertions, 19 deletions
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/DownService.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/DownService.java index d39cabcbf93..72277f54d88 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/DownService.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/DownService.java @@ -18,8 +18,7 @@ public class DownService extends VespaService { } @Override - public Metrics getMetrics() { - return new Metrics(); + public void consumeMetrics(MetricsParser.Consumer consumer) { } @Override diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/DummyService.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/DummyService.java index ccbb237ae37..28b4db12855 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/DummyService.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/DummyService.java @@ -2,7 +2,6 @@ package ai.vespa.metricsproxy.service; import ai.vespa.metricsproxy.metric.Metric; -import ai.vespa.metricsproxy.metric.Metrics; import ai.vespa.metricsproxy.metric.model.MetricId; /** @@ -21,14 +20,10 @@ public class DummyService extends VespaService { } @Override - public Metrics getMetrics() { - Metrics m = new Metrics(); - + public void consumeMetrics(MetricsParser.Consumer consumer) { long timestamp = System.currentTimeMillis() / 1000; - m.add(new Metric(MetricId.toMetricId(METRIC_1), 5 * num + 1, timestamp)); - m.add(new Metric(MetricId.toMetricId(METRIC_2), 1.3 * num + 1.05, timestamp)); - - return m; + consumer.consume(new Metric(MetricId.toMetricId(METRIC_1), 5 * num + 1, timestamp)); + consumer.consume(new Metric(MetricId.toMetricId(METRIC_2), 1.3 * num + 1.05, timestamp)); } } diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java index defcf4bfaaa..ed3e8ef3d56 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MetricsFetcherTest.java @@ -2,6 +2,7 @@ package ai.vespa.metricsproxy.service; import ai.vespa.metricsproxy.TestUtil; +import ai.vespa.metricsproxy.metric.Metric; import ai.vespa.metricsproxy.metric.Metrics; import ai.vespa.metricsproxy.metric.model.MetricId; import org.junit.Test; @@ -15,11 +16,24 @@ public class MetricsFetcherTest { private static int port = 9; //port number is not used in this test + private class MetricsConsumer implements MetricsParser.Consumer { + Metrics metrics = new Metrics(); + @Override + public void consume(Metric metric) { + metrics.add(metric); + } + } + Metrics fetch(String data) { + RemoteMetricsFetcher fetcher = new RemoteMetricsFetcher(new DummyService(0, "dummy/id/0"), port); + MetricsConsumer consumer = new MetricsConsumer(); + fetcher.createMetrics(data, consumer, 0); + return consumer.metrics; + } + @Test public void testStateFormatMetricsParse() { String jsonData = TestUtil.getFileContents("metrics-state.json"); - RemoteMetricsFetcher fetcher = new RemoteMetricsFetcher(new DummyService(0, "dummy/id/0"), port); - Metrics metrics = fetcher.createMetrics(jsonData, 0); + Metrics metrics = fetch(jsonData); assertThat(metrics.size(), is(10)); assertThat(metrics.getMetric(MetricId.toMetricId("query_hits.count")).getValue().intValue(), is(28)); assertThat(metrics.getMetric(MetricId.toMetricId("queries.rate")).getValue().doubleValue(), is(0.4667)); @@ -29,8 +43,7 @@ public class MetricsFetcherTest { @Test public void testEmptyJson() { String jsonData = "{}"; - RemoteMetricsFetcher fetcher = new RemoteMetricsFetcher(new DummyService(0, "dummy/id/0"), port); - Metrics metrics = fetcher.createMetrics(jsonData, 0); + Metrics metrics = fetch(jsonData); assertThat("Wrong number of metrics", metrics.size(), is(0)); } @@ -39,10 +52,8 @@ public class MetricsFetcherTest { String jsonData; Metrics metrics; - RemoteMetricsFetcher fetcher = new RemoteMetricsFetcher(new DummyService(0, "dummy/id/0"), port); - jsonData = ""; - metrics = fetcher.createMetrics(jsonData, 0); + metrics = fetch(jsonData); assertThat("Wrong number of metrics", metrics.size(), is(0)); jsonData = "{\n" + @@ -51,7 +62,7 @@ public class MetricsFetcherTest { " \"message\" : \"Everything ok here\"\n" + "}\n" + "}"; - metrics = fetcher.createMetrics(jsonData, 0); + metrics = fetch(jsonData); assertThat("Wrong number of metrics", metrics.size(), is(0)); jsonData = "{\n" + @@ -80,7 +91,7 @@ public class MetricsFetcherTest { "}\n" + "}"; - metrics = fetcher.createMetrics(jsonData, 0); + metrics = fetch(jsonData); assertThat("Wrong number of metrics", metrics.size(), is(0)); } } |