diff options
Diffstat (limited to 'jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java')
| -rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java | 14 |
1 files changed, 8 insertions, 6 deletions
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); |