diff options
Diffstat (limited to 'metrics-proxy/src/test/java')
6 files changed, 6 insertions, 37 deletions
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/prometheus/PrometheusHandlerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/prometheus/PrometheusHandlerTest.java index 2c216272022..90536ddcfdb 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/prometheus/PrometheusHandlerTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/prometheus/PrometheusHandlerTest.java @@ -60,23 +60,12 @@ public class PrometheusHandlerTest extends HttpHandlerTestBase { } @Test - public void response_contains_node_status() { - assertTrue(valuesResponse.contains("vespa_node_status 1.0")); - } - - @Test public void response_contains_node_metrics() { String cpu = getLine(valuesResponse, CPU_METRIC + "{"); assertTrue(cpu.contains("} 12.345")); // metric value } @Test - public void response_contains_service_status() { - assertTrue(valuesResponse.contains("vespa_dummy_status 1.0")); - assertTrue(valuesResponse.contains("vespa_down_service_status 0.0")); - } - - @Test public void response_contains_service_metrics() { String dummy0 = getLine(valuesResponse, DummyService.NAME + "0"); assertTrue(dummy0.contains("c_test")); // metric name diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/yamas/YamasHandlerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/yamas/YamasHandlerTest.java index a4e61d5965e..346fc6a462b 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/yamas/YamasHandlerTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/yamas/YamasHandlerTest.java @@ -13,6 +13,7 @@ import java.util.List; import java.util.concurrent.Executors; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class YamasHandlerTest extends HttpHandlerTestBase { @@ -48,8 +49,9 @@ public class YamasHandlerTest extends HttpHandlerTestBase { } @Test - public void value_response_contains_coredump_metric() { - assertTrue(valuesResponse.contains("\"application\":\"system-coredumps-processing\",\"routing\":{\"yamas\":{\"namespaces\":[\"Vespa\"]}}")); + public void value_response_does_not_contain_status() { + assertFalse(valuesResponse.contains("status_code")); + assertFalse(valuesResponse.contains("status_msg")); } } diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java index a5bc7a0877a..3e85166430d 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonModelTest.java @@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue; */ public class YamasJsonModelTest { - private static final String EXPECTED_JSON = "{\"metrics\":[{\"status_code\":0,\"timestamp\":1400047900,\"application\":\"vespa.searchnode\",\"metrics\":{\"cpu\":55.5555555555555,\"memory_virt\":22222222222,\"memory_rss\":5555555555},\"dimensions\":{\"applicationName\":\"app\",\"tenantName\":\"tenant\",\"metrictype\":\"system\",\"instance\":\"searchnode\",\"applicationInstance\":\"default\",\"clustername\":\"cluster\"},\"routing\":{\"yamas\":{\"namespaces\":[\"Vespa\"]}},\"status_msg\":\"Data collected successfully\"}]}"; + private static final String EXPECTED_JSON = "{\"metrics\":[{\"timestamp\":1400047900,\"application\":\"vespa.searchnode\",\"metrics\":{\"cpu\":55.5555555555555,\"memory_virt\":22222222222,\"memory_rss\":5555555555},\"dimensions\":{\"applicationName\":\"app\",\"tenantName\":\"tenant\",\"metrictype\":\"system\",\"instance\":\"searchnode\",\"applicationInstance\":\"default\",\"clustername\":\"cluster\"},\"routing\":{\"yamas\":{\"namespaces\":[\"Vespa\"]}}}]}"; @Test public void array_definition_creates_correct_json() throws IOException { @@ -69,7 +69,7 @@ public class YamasJsonModelTest { assertEquals(5.555555555E9, metricsPacket.metrics().get(toMetricId("memory_rss")).doubleValue(), 0.1d); //Not using custom double rendrer // Serialize and verify - String string = YamasJsonUtil.toJson(List.of(metricsPacket), true); + String string = YamasJsonUtil.toJson(List.of(metricsPacket), false); assertEquals(EXPECTED_JSON, string); } diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtilTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtilTest.java index ebd80b38a42..133461e3658 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtilTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtilTest.java @@ -31,15 +31,6 @@ public class YamasJsonUtilTest { private static ArrayNode metrics(List<MetricsPacket> packets, boolean addStatus) throws IOException { return (ArrayNode) jsonMapper.readTree(YamasJsonUtil.toJson(packets, addStatus)).get("metrics"); } - @Test - public void json_model_gets_null_status_by_default() throws IOException { - ArrayNode json = metrics(List.of(new MetricsPacket.Builder(toServiceId("foo")).build(), - new MetricsPacket.Builder(toServiceId("bar")).build()), false); - assertFalse(json.get(0).has("status_code")); - assertFalse(json.get(0).has("status_msg")); - assertTrue(json.get(1).has("status_code")); - assertTrue(json.get(1).has("status_msg")); - } @Test public void status_is_included_in_json_model_when_explicitly_asked_for() throws IOException { diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/node/NodeMetricGathererTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/node/NodeMetricGathererTest.java index 0de3526b40d..635365f9462 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/node/NodeMetricGathererTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/node/NodeMetricGathererTest.java @@ -30,8 +30,6 @@ public class NodeMetricGathererTest { MetricsPacket packet = builders.remove(0).build(); assertEquals("host_life", packet.service.id); - assertEquals(0, packet.statusCode); - assertEquals("OK", packet.statusMessage); assertEquals(123, packet.timestamp); assertEquals(12l, packet.metrics().get(MetricId.toMetricId("uptime"))); assertEquals(1l, packet.metrics().get(MetricId.toMetricId("alive"))); @@ -41,8 +39,6 @@ public class NodeMetricGathererTest { private JsonNode generateHostLifePacket() { ObjectNode jsonObject = jsonMapper.createObjectNode(); - jsonObject.put("status_code", 0); - jsonObject.put("status_msg", "OK"); jsonObject.put("timestamp", 123); jsonObject.put("application", "host_life"); ObjectNode metrics = jsonMapper.createObjectNode(); diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java index 1e7a398b3d0..142740356d7 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java @@ -167,7 +167,6 @@ public class RpcMetricsTest { } } - verifyStatusMessage(metrics.get(metrics.size() - 1)); } private void verfiyMetricsFromServiceObject(VespaService service) { @@ -266,12 +265,4 @@ public class RpcMetricsTest { return returnValue; } - private static void verifyStatusMessage(JsonNode jsonObject) { - assertEquals(0, jsonObject.get("status_code").intValue()); - assertNotNull(jsonObject.get("status_msg")); - assertNotNull(jsonObject.get("application")); - assertNotNull(jsonObject.get("routing")); - assertEquals(4, jsonObject.size()); - } - } |