diff options
author | gjoranv <gjoranv@gmail.com> | 2017-05-22 15:58:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-22 15:58:21 +0200 |
commit | b11c40bd79ea313648ba806a7a355da13508a031 (patch) | |
tree | 6cadd0e4194f820fa22282f2959f9dbfd28960e8 /jdisc_http_service/src | |
parent | b27e8213f67d0fb76abb5cd0949d8c3730a15a01 (diff) | |
parent | d844ee7803209ea123751ba40b589afa9e8a93be (diff) |
Merge pull request #2475 from yahoo/bjorncs/remove-manhattan-integration
Remove Manhattan integration
Diffstat (limited to 'jdisc_http_service/src')
3 files changed, 13 insertions, 6 deletions
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 16600edec7f..a39f0b159c0 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 @@ -67,6 +67,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 { @@ -83,15 +84,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"; @@ -99,10 +100,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"; @@ -111,7 +112,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()); @@ -380,6 +381,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); |