diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-11-23 16:01:25 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-11-23 16:01:25 +0100 |
| commit | 49cdc86ecde002ee9f58022726bd113c25b7c064 (patch) | |
| tree | 6f69d60f0239bb01f492f0ab21644f83908591f7 /container-core | |
| parent | 29e722b8d3a8ef088f3e302ceeb88a1736e13f25 (diff) | |
Deprecate metrics 'http.status.[401|403]'
Diffstat (limited to 'container-core')
3 files changed, 4 insertions, 2 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java index 8fd4c064a2c..0aa2820f959 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java @@ -299,6 +299,7 @@ class HttpResponseStatisticsCollector extends HandlerWrapper implements Graceful .collect(Collectors.toSet()); } + @SuppressWarnings("removal") private static Collection<String> metricNames(Request req) { int code = req.getResponse().getStatus(); if (code == 401) return Set.of(MetricDefinitions.RESPONSES_401, MetricDefinitions.RESPONSES_4XX); diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java index 4099511c2c2..b3a7ebc761a 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/MetricDefinitions.java @@ -50,8 +50,8 @@ class MetricDefinitions { static final String RESPONSES_3XX = "http.status.3xx"; static final String RESPONSES_4XX = "http.status.4xx"; static final String RESPONSES_5XX = "http.status.5xx"; - static final String RESPONSES_401 = "http.status.401"; - static final String RESPONSES_403 = "http.status.403"; + @Deprecated(forRemoval = true, since = "7") static final String RESPONSES_401 = "http.status.401"; + @Deprecated(forRemoval = true, since = "7") static final String RESPONSES_403 = "http.status.403"; static final String STARTED_MILLIS = "serverStartedMillis"; diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollectorTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollectorTest.java index 3187ea510d4..231a9f1384a 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollectorTest.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollectorTest.java @@ -76,6 +76,7 @@ public class HttpResponseStatisticsCollectorTest { } @Test + @SuppressWarnings("removal") public void statistics_include_grouped_and_single_statuscodes() { testRequest("http", 401, "GET"); testRequest("http", 404, "GET"); |