Updated ApplicationMetricsHandler. Removed PrometheusV1Handler

1 files changed, 0 insertions, 116 deletions

diff --git a/container-core/src/test/java/com/yahoo/container/handler/metrics/PrometheusV1HandlerTest.java b/container-core/src/test/java/com/yahoo/container/handler/metrics/PrometheusV1HandlerTest.java
deleted file mode 100644
index ece2e37085c..00000000000
--- a/container-core/src/test/java/com/yahoo/container/handler/metrics/PrometheusV1HandlerTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.yahoo.container.handler.metrics;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import com.yahoo.container.jdisc.RequestHandlerTestDriver;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static com.yahoo.container.handler.metrics.PrometheusV1Handler.consumerQuery;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class PrometheusV1HandlerTest {
-
-    private static final String URI_BASE = "http://localhost";
-
-    private static final String V1_URI = URI_BASE + PrometheusV1Handler.V1_PATH;
-    private static final String VALUES_URI = URI_BASE + PrometheusV1Handler.VALUES_PATH;
-
-    // Mock applicationmetrics api
-    private static final String MOCK_METRICS_PATH = "/node0";
-
-    private static final String TEST_FILE = "application-metrics.json";
-    private static final String RESPONSE = getFileContents(TEST_FILE);
-    private static final String CPU_METRIC = "cpu";
-    private static final String REPLACED_CPU_METRIC = "cpu.util";
-    private static final String CUSTOM_CONSUMER = "custom-consumer";
-
-    private static RequestHandlerTestDriver testDriver;
-
-    @Rule
-    public WireMockRule wireMockRule = new WireMockRule(80);
-
-    private static String getFileContents(String filename) {
-        InputStream in = PrometheusV1HandlerTest.class.getClassLoader().getResourceAsStream(filename);
-        if (in == null) {
-            throw new RuntimeException("File not found: " + filename);
-        }
-        return new BufferedReader(new InputStreamReader(in)).lines().collect(Collectors.joining("\n"));
-    }
-
-    @Before
-    public void setup() {
-        setupWireMock();
-        var handler = new PrometheusV1Handler(Executors.newSingleThreadExecutor(),
-                new MetricsProxyApiConfig.Builder()
-                        .metricsPort(wireMockRule.port())
-                        .metricsApiPath(MOCK_METRICS_PATH)
-                        .build());
-        testDriver = new RequestHandlerTestDriver(handler);
-    }
-
-    private void setupWireMock() {
-        wireMockRule.stubFor(get(urlPathEqualTo(MOCK_METRICS_PATH))
-                .willReturn(aResponse().withBody(RESPONSE)));
-
-        // Add a slightly different response for a custom consumer.
-        String myConsumerResponse = RESPONSE.replace(CPU_METRIC, REPLACED_CPU_METRIC);
-        wireMockRule.stubFor(get(urlPathEqualTo(MOCK_METRICS_PATH))
-                .withQueryParam("consumer", equalTo(CUSTOM_CONSUMER))
-                .willReturn(aResponse().withBody(myConsumerResponse)));
-
-    }
-
-    @Test
-    public void v1_response_contains_values_uri() throws Exception {
-        String response = testDriver.sendRequest(V1_URI).readAll();
-        JSONObject root = new JSONObject(response);
-        assertTrue(root.has("resources"));
-
-        JSONArray resources = root.getJSONArray("resources");
-        assertEquals(1, resources.length());
-
-        JSONObject valuesUri = resources.getJSONObject(0);
-        assertEquals(VALUES_URI, valuesUri.getString("url"));
-    }
-
-    @Test
-    public void invalid_path_yields_error_response() throws Exception {
-        String response = testDriver.sendRequest(V1_URI + "/invalid").readAll();
-        JSONObject root = new JSONObject(response);
-        assertTrue(root.has("error"));
-        assertTrue(root.getString("error").startsWith("No content"));
-    }
-
-    @Test
-    public void values_response_is_equal_to_test_file() {
-        String response = testDriver.sendRequest(VALUES_URI).readAll();
-        assertEquals(RESPONSE, response);
-    }
-
-    @Test
-    public void consumer_is_propagated_to_metrics_proxy_api() {
-        String response = getResponseAsString(CUSTOM_CONSUMER);
-
-        assertTrue(response.contains(REPLACED_CPU_METRIC));
-
-
-    }
-
-    private String getResponseAsString(String consumer) {
-        return testDriver.sendRequest(VALUES_URI + consumerQuery(consumer)).readAll();
-    }
-}