diff options
4 files changed, 30 insertions, 22 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java index 1c6e85a177a..74e2c243c89 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java @@ -1,17 +1,17 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc.metric; -import java.util.Timer; -import java.util.TimerTask; -import java.nio.file.DirectoryStream; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.Files; - import com.google.inject.Inject; import com.yahoo.component.AbstractComponent; import com.yahoo.jdisc.Metric; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Timer; +import java.util.TimerTask; + /** * Uses a timer to emit metrics * @@ -21,12 +21,12 @@ import com.yahoo.jdisc.Metric; */ public class MetricUpdater extends AbstractComponent { - private static final String FREE_MEMORY_BYTES = "freeMemoryBytes"; - private static final String USED_MEMORY_BYTES = "usedMemoryBytes"; - private static final String TOTAL_MEMORY_BYTES = "totalMemoryBytes"; - private static final String MANHATTAN_FREE_MEMORY_BYTES = "mem.heap.free"; - private static final String MANHATTAN_USED_MEMORY_BYTES = "mem.heap.used"; - private static final String MANHATTAN_TOTAL_MEMORY_BYTES = "mem.heap.total"; + @Deprecated private static final String DEPRECATED_FREE_MEMORY_BYTES = "freeMemoryBytes"; + @Deprecated private static final String DEPRECATED_USED_MEMORY_BYTES = "usedMemoryBytes"; + @Deprecated private static final String DEPRECATED_TOTAL_MEMORY_BYTES = "totalMemoryBytes"; + private static final String FREE_MEMORY_BYTES = "mem.heap.free"; + private static final String USED_MEMORY_BYTES = "mem.heap.used"; + private static final String TOTAL_MEMORY_BYTES = "mem.heap.total"; private static final String MEMORY_MAPPINGS_COUNT = "jdisc.memory_mappings"; private static final String OPEN_FILE_DESCRIPTORS = "jdisc.open_file_descriptors"; @@ -55,17 +55,18 @@ public class MetricUpdater extends AbstractComponent { long getTotalMemory() { return totalMemory; } private class UpdaterTask extends TimerTask { + @SuppressWarnings("deprecation") @Override public void run() { freeMemory = Runtime.getRuntime().freeMemory(); totalMemory = Runtime.getRuntime().totalMemory(); long usedMemory = totalMemory - freeMemory; + metric.set(DEPRECATED_FREE_MEMORY_BYTES, freeMemory, null); + metric.set(DEPRECATED_USED_MEMORY_BYTES, usedMemory, null); + metric.set(DEPRECATED_TOTAL_MEMORY_BYTES, totalMemory, null); metric.set(FREE_MEMORY_BYTES, freeMemory, null); metric.set(USED_MEMORY_BYTES, usedMemory, null); metric.set(TOTAL_MEMORY_BYTES, totalMemory, null); - metric.set(MANHATTAN_FREE_MEMORY_BYTES, freeMemory, null); - metric.set(MANHATTAN_USED_MEMORY_BYTES, usedMemory, null); - metric.set(MANHATTAN_TOTAL_MEMORY_BYTES, totalMemory, null); metric.set(MEMORY_MAPPINGS_COUNT, count_mappings(), null); metric.set(OPEN_FILE_DESCRIPTORS, count_open_files(), null); } diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java index 2af7646e905..e99ea7bc799 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscHttpServlet.java @@ -87,6 +87,7 @@ class JDiscHttpServlet extends HttpServlet { * Override to set connector attribute before the request becomes an upgrade request in the web socket case. * (After the upgrade, the HttpConnection is no longer available.) */ + @SuppressWarnings("deprecation") @Override protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { request.setAttribute(JDiscServerConnector.REQUEST_ATTRIBUTE, getConnector(request)); diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java index 837f21519f2..02d4e756301 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java @@ -62,6 +62,7 @@ import static com.yahoo.jdisc.http.server.jetty.Exceptions.throwUnchecked; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author bjorncs */ @Beta public class JettyHttpServer extends AbstractServerProvider { @@ -78,15 +79,15 @@ public class JettyHttpServer extends AbstractServerProvider { String NUM_BYTES_RECEIVED = "serverBytesReceived"; String NUM_BYTES_SENT = "serverBytesSent"; - String MANHATTAN_NUM_BYTES_RECEIVED = "http.in.bytes"; - String MANHATTAN_NUM_BYTES_SENT = "http.out.bytes"; + @Deprecated String MANHATTAN_NUM_BYTES_RECEIVED = "http.in.bytes"; + @Deprecated String MANHATTAN_NUM_BYTES_SENT = "http.out.bytes"; String NUM_CONNECTIONS = "serverNumConnections"; /* For historical reasons, these are all aliases for the same metric. 'jdisc.http' should ideally be the only one. */ String JDISC_HTTP_REQUESTS = "jdisc.http.requests"; String NUM_REQUESTS = "serverNumRequests"; - String MANHATTAN_NUM_REQUESTS = "http.requests"; + @Deprecated String MANHATTAN_NUM_REQUESTS = "http.requests"; String NUM_SUCCESSFUL_RESPONSES = "serverNumSuccessfulResponses"; String NUM_FAILED_RESPONSES = "serverNumFailedResponses"; @@ -94,10 +95,10 @@ public class JettyHttpServer extends AbstractServerProvider { String NUM_FAILED_WRITES = "serverNumFailedResponseWrites"; String TOTAL_SUCCESSFUL_LATENCY = "serverTotalSuccessfulResponseLatency"; - String MANHATTAN_TOTAL_SUCCESSFUL_LATENCY = "http.latency"; + @Deprecated String MANHATTAN_TOTAL_SUCCESSFUL_LATENCY = "http.latency"; String TOTAL_FAILED_LATENCY = "serverTotalFailedResponseLatency"; String TIME_TO_FIRST_BYTE = "serverTimeToFirstByte"; - String MANHATTAN_TIME_TO_FIRST_BYTE = "http.out.firstbytetime"; + @Deprecated String MANHATTAN_TIME_TO_FIRST_BYTE = "http.out.firstbytetime"; String RESPONSES_1XX = "http.status.1xx"; String RESPONSES_2XX = "http.status.2xx"; @@ -106,7 +107,7 @@ public class JettyHttpServer extends AbstractServerProvider { String RESPONSES_5XX = "http.status.5xx"; String STARTED_MILLIS = "serverStartedMillis"; - String MANHATTAN_STARTED_MILLIS = "proc.uptime"; + @Deprecated String MANHATTAN_STARTED_MILLIS = "proc.uptime"; } private final static Logger log = Logger.getLogger(JettyHttpServer.class.getName()); @@ -353,6 +354,7 @@ public class JettyHttpServer extends AbstractServerProvider { } + @SuppressWarnings("deprecation") private void setServerMetrics(StatisticsHandler statistics) { long timeSinceStarted = System.currentTimeMillis() - timeStarted; metric.set(Metrics.STARTED_MILLIS, timeSinceStarted, null); diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricReporter.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricReporter.java index e601b31f7ab..583d0548d69 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricReporter.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricReporter.java @@ -30,6 +30,7 @@ public class MetricReporter { this.requestStartTime = requestStartTime; } + @SuppressWarnings("deprecation") public void successfulWrite(int numBytes) { setTimeToFirstByteFirstTime(); @@ -38,6 +39,7 @@ public class MetricReporter { metric.set(Metrics.MANHATTAN_NUM_BYTES_SENT, numBytes, context); } + @SuppressWarnings("deprecation") private void setTimeToFirstByteFirstTime() { boolean isFirstWrite = firstSetOfTimeToFirstByte.getAndSet(false); if (isFirstWrite) { @@ -51,6 +53,7 @@ public class MetricReporter { metric.add(Metrics.NUM_FAILED_WRITES, 1, context); } + @SuppressWarnings("deprecation") public void successfulResponse() { setTimeToFirstByteFirstTime(); @@ -69,6 +72,7 @@ public class MetricReporter { metric.add(Metrics.NUM_FAILED_RESPONSES, 1, context); } + @SuppressWarnings("deprecation") public void successfulRead(int bytes_received) { metric.set(JettyHttpServer.Metrics.NUM_BYTES_RECEIVED, bytes_received, context); metric.set(JettyHttpServer.Metrics.MANHATTAN_NUM_BYTES_RECEIVED, bytes_received, context); |