summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-03-13 11:41:01 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-03-13 11:42:34 +0100
commit0c8ebb4735a6d97b13c221efb65adc18c75e66dd (patch)
tree7adc2fdb558f7ca1320af7e49e96056725014f65 /container-core
parent0907c88c0b4dec4ad0037c9c2d3dc1f1c61ab4c4 (diff)
Use plural ending in new metric names
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java2
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java2
-rw-r--r--container-core/src/test/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandlerTest.java2
3 files changed, 3 insertions, 3 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 7d6a8ab9598..7c95ed602f8 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_exception";
+ private static final String UNHANDLED_EXCEPTION_METRIC = "jdisc.thread_pool.unhandled_exceptions";
volatile long lastThreadAssignmentTimeMillis = System.currentTimeMillis();
private final AtomicLong startedCount = new AtomicLong(0);
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 680a30b5ee1..63ccc66e789 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_exception";
+ private static final String UNHANDLED_EXCEPTION_METRIC = "jdisc.http.handler.unhandled_exceptions";
/** Logger for subclasses */
protected final Logger log;
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 fc86da5719f..c22b4e4060d 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
@@ -22,7 +22,7 @@ public class ThreadedHttpRequestHandlerTest {
RequestHandlerTestDriver driver = new RequestHandlerTestDriver(handler);
driver.sendRequest("http://localhost/myhandler");
- String expectedMetricName = "jdisc.http.handler.unhandled_exception";
+ String expectedMetricName = "jdisc.http.handler.unhandled_exceptions";
assertThat(metricMock.addInvocations)
.containsKey(expectedMetricName);
assertThat(metricMock.addInvocations.get(expectedMetricName).dimensions)