aboutsummaryrefslogtreecommitdiffstats
path: root/container-core/src/main/java/com/yahoo/container/handler/metrics
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-11-18 20:37:35 +0100
committerJon Bratseth <bratseth@gmail.com>2020-11-18 20:37:35 +0100
commitb01ecd72d26a45ff4b498881446f5e62237c64be (patch)
treec6b4626e262d234900929132e4554b00cda03c49 /container-core/src/main/java/com/yahoo/container/handler/metrics
parent804b5ea7d3822847d2b732c79fd35a5eceba15b4 (diff)
Non-functional-changes-only
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/handler/metrics')
-rw-r--r--container-core/src/main/java/com/yahoo/container/handler/metrics/ErrorResponse.java6
-rw-r--r--container-core/src/main/java/com/yahoo/container/handler/metrics/JsonResponse.java2
-rw-r--r--container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java1
-rw-r--r--container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java3
4 files changed, 10 insertions, 2 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/ErrorResponse.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/ErrorResponse.java
index 1fcde746878..c59dc2939a5 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/metrics/ErrorResponse.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/ErrorResponse.java
@@ -13,9 +13,10 @@ import static java.util.logging.Level.WARNING;
* @author gjoranv
*/
public class ErrorResponse extends JsonResponse {
- private static Logger log = Logger.getLogger(ErrorResponse.class.getName());
- private static ObjectMapper objectMapper = new ObjectMapper();
+ private static final Logger log = Logger.getLogger(ErrorResponse.class.getName());
+
+ private static final ObjectMapper objectMapper = new ObjectMapper();
public ErrorResponse(int code, String message) {
super(code, asErrorJson(message != null ? message : "<null>"));
@@ -29,4 +30,5 @@ public class ErrorResponse extends JsonResponse {
return "Could not encode error message to json, check the log for details.";
}
}
+
}
diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/JsonResponse.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/JsonResponse.java
index def06ce9de3..fc817332079 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/metrics/JsonResponse.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/JsonResponse.java
@@ -11,6 +11,7 @@ import java.nio.charset.Charset;
* @author gjoranv
*/
public class JsonResponse extends HttpResponse {
+
private final byte[] data;
public JsonResponse(int code, String data) {
@@ -27,4 +28,5 @@ public class JsonResponse extends HttpResponse {
public void render(OutputStream outputStream) throws IOException {
outputStream.write(data);
}
+
}
diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java
index 78ea62e1b3a..a4a092b02ad 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java
@@ -74,4 +74,5 @@ public class MetricsV2Handler extends HttpHandlerBase {
static String consumerQuery(String consumer) {
return (consumer == null || consumer.isEmpty()) ? "" : "?consumer=" + consumer;
}
+
}
diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java
index e33f2f47828..00fb488489e 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java
@@ -20,6 +20,9 @@ import org.apache.http.impl.client.CloseableHttpClient;
import static com.yahoo.container.handler.metrics.MetricsV2Handler.consumerQuery;
import static com.yahoo.jdisc.Response.Status.INTERNAL_SERVER_ERROR;
+/**
+ * @author Oracien
+ */
public class PrometheusV1Handler extends HttpHandlerBase{
public static final String V1_PATH = "/prometheus/v1";