Update method and constant names to match new metric name

3 files changed, 5 insertions, 5 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java
index 7c95ed602f8..b427a58c9b7 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java
@@ -163,7 +163,7 @@ public class ThreadPoolProvider extends AbstractComponent implements Provider<Ex
     /** A thread pool executor which maintains the last time a worker completed */
     private final static class WorkerCompletionTimingThreadPoolExecutor extends ThreadPoolExecutor {
 
-        private static final String UNHANDLED_EXCEPTION_METRIC = "jdisc.thread_pool.unhandled_exceptions";
+        private static final String UNHANDLED_EXCEPTIONS_METRIC = "jdisc.thread_pool.unhandled_exceptions";
 
         volatile long lastThreadAssignmentTimeMillis = System.currentTimeMillis();
         private final AtomicLong startedCount = new AtomicLong(0);
@@ -193,7 +193,7 @@ public class ThreadPoolProvider extends AbstractComponent implements Provider<Ex
             super.afterExecute(r, t);
             completedCount.incrementAndGet();
             if (t != null) {
-                metric.add(UNHANDLED_EXCEPTION_METRIC, 1L, metric.createContext(Map.of("exception", t.getClass().getSimpleName())));
+                metric.add(UNHANDLED_EXCEPTIONS_METRIC, 1L, metric.createContext(Map.of("exception", t.getClass().getSimpleName())));
             }
         }
 
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
index 63ccc66e789..c58d49bf8c8 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
@@ -32,7 +32,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler
 
     public static final String CONTENT_TYPE = "Content-Type";
     private static final String RENDERING_ERRORS = "rendering_errors";
-    private static final String UNHANDLED_EXCEPTION_METRIC = "jdisc.http.handler.unhandled_exceptions";
+    private static final String UNHANDLED_EXCEPTIONS_METRIC = "jdisc.http.handler.unhandled_exceptions";
 
     /** Logger for subclasses */
     protected final Logger log;
@@ -81,7 +81,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler
             channel.setHttpResponse(httpResponse); // may or may not have already been done
             render(httpRequest, httpResponse, channel, jdiscRequest.creationTime(TimeUnit.MILLISECONDS));
         } catch (Exception e) {
-            metric.add(UNHANDLED_EXCEPTION_METRIC, 1L, contextFor(request, Map.of("exception", e.getClass().getSimpleName())));
+            metric.add(UNHANDLED_EXCEPTIONS_METRIC, 1L, contextFor(request, Map.of("exception", e.getClass().getSimpleName())));
             metric.add(RENDERING_ERRORS, 1, null);
             log.log(LogLevel.ERROR, "Uncaught exception handling request", e);
             if (channel != null) {
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandlerTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandlerTest.java
index c22b4e4060d..07dba21e5b6 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandlerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandlerTest.java
@@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class ThreadedHttpRequestHandlerTest {
 
     @Test
-    public void unhandled_exception_metric_is_incremented_if_subclassed_handler_throws_exception() {
+    public void unhandled_exceptions_metric_is_incremented_if_subclassed_handler_throws_exception() {
         MetricMock metricMock = new MetricMock();
         ThreadedHttpRequestHandlerThrowingException handler = new ThreadedHttpRequestHandlerThrowingException(metricMock);
         RequestHandlerTestDriver driver = new RequestHandlerTestDriver(handler);