diff options
author | Kristian Aune <kraune@verizonmedia.com> | 2023-01-10 17:05:30 +0100 |
---|---|---|
committer | Kristian Aune <kraune@verizonmedia.com> | 2023-01-10 17:05:30 +0100 |
commit | 585e11b507f58b796945fa654a8d252447f05877 (patch) | |
tree | 8293daea4219ba74e84c476a692ab8dafdf221bd /container-core/src/test/java/com | |
parent | 3e5d7fbea7cc63af994c9bb82ed7117f76ab127e (diff) |
Move metric definitions to ContainerMetrics.java
Diffstat (limited to 'container-core/src/test/java/com')
-rw-r--r-- | container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java b/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java index 4639022d767..606f8052670 100644 --- a/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java +++ b/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java @@ -6,6 +6,7 @@ import com.yahoo.concurrent.Receiver; import com.yahoo.container.protect.ProcessTerminator; import com.yahoo.container.test.MetricMock; import com.yahoo.jdisc.Metric; +import com.yahoo.metrics.ContainerMetrics; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -81,10 +82,10 @@ public class ContainerThreadPoolImplTest { assertEquals(1200, executor.getQueue().remainingCapacity()); assertEquals(7, metrics.innvocations().size()); assertEquals(3L, metrics.innvocations().get("serverThreadPoolSize").val); - assertEquals(3L, metrics.innvocations().get("jdisc.thread_pool.max_allowed_size").val); + assertEquals(3L, metrics.innvocations().get(ContainerMetrics.JDISC_THREAD_POOL_MAX_ALLOWED_SIZE.baseName()).val); assertEquals(0L, metrics.innvocations().get("serverActiveThreads").val); - assertEquals(1200L, metrics.innvocations().get("jdisc.thread_pool.work_queue.capacity").val); - assertEquals(0L, metrics.innvocations().get("jdisc.thread_pool.work_queue.size").val); + assertEquals(1200L, metrics.innvocations().get(ContainerMetrics.JDISC_THREAD_POOL_WORK_QUEUE_CAPACITY.baseName()).val); + assertEquals(0L, metrics.innvocations().get(ContainerMetrics.JDISC_THREAD_POOL_WORK_QUEUE_SIZE.baseName()).val); } @Test @@ -95,10 +96,10 @@ public class ContainerThreadPoolImplTest { assertEquals(0, executor.getQueue().remainingCapacity()); assertEquals(7, metrics.innvocations().size()); assertEquals(64L, metrics.innvocations().get("serverThreadPoolSize").val); - assertEquals(64L, metrics.innvocations().get("jdisc.thread_pool.max_allowed_size").val); + assertEquals(64L, metrics.innvocations().get(ContainerMetrics.JDISC_THREAD_POOL_MAX_ALLOWED_SIZE.baseName()).val); assertEquals(0L, metrics.innvocations().get("serverActiveThreads").val); - assertEquals(64L, metrics.innvocations().get("jdisc.thread_pool.work_queue.capacity").val); - assertEquals(0L, metrics.innvocations().get("jdisc.thread_pool.work_queue.size").val); + assertEquals(64L, metrics.innvocations().get(ContainerMetrics.JDISC_THREAD_POOL_WORK_QUEUE_CAPACITY.baseName()).val); + assertEquals(0L, metrics.innvocations().get(ContainerMetrics.JDISC_THREAD_POOL_WORK_QUEUE_SIZE.baseName()).val); } @Test |