diff options
| author | gjoranv <gv@oath.com> | 2018-09-18 15:30:47 +0200 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:21 +0100 |
| commit | ba975ae4813b3906507c44a91b65922876f1f66a (patch) | |
| tree | 8e84a6db186f00bd7f1e3765e074ccf660952230 /container-disc | |
| parent | f8b4fde1f2afaf8f3393075823c991fe2ad5092e (diff) | |
Remove deprecated metrics (*MemoryBytes)
Diffstat (limited to 'container-disc')
| -rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java | 6 | ||||
| -rw-r--r-- | container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java index c2ef789e8fc..98787eaeeeb 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricUpdater.java @@ -24,9 +24,6 @@ import java.util.TimerTask; */ public class MetricUpdater extends AbstractComponent { - @Deprecated private static final String DEPRECATED_FREE_MEMORY_BYTES = "freeMemoryBytes"; - @Deprecated private static final String DEPRECATED_USED_MEMORY_BYTES = "usedMemoryBytes"; - @Deprecated private static final String DEPRECATED_TOTAL_MEMORY_BYTES = "totalMemoryBytes"; private static final String FREE_MEMORY_BYTES = "mem.heap.free"; private static final String USED_MEMORY_BYTES = "mem.heap.used"; private static final String TOTAL_MEMORY_BYTES = "mem.heap.total"; @@ -104,9 +101,6 @@ public class MetricUpdater extends AbstractComponent { long freeMemory = runtime.freeMemory(); long totalMemory = runtime.totalMemory(); long usedMemory = totalMemory - freeMemory; - metric.set(DEPRECATED_FREE_MEMORY_BYTES, freeMemory, null); - metric.set(DEPRECATED_USED_MEMORY_BYTES, usedMemory, null); - metric.set(DEPRECATED_TOTAL_MEMORY_BYTES, totalMemory, null); metric.set(FREE_MEMORY_BYTES, freeMemory, null); metric.set(USED_MEMORY_BYTES, usedMemory, null); metric.set(TOTAL_MEMORY_BYTES, totalMemory, null); diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java index e9e04eab3b4..25d5b7b9886 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java @@ -27,7 +27,7 @@ public class MetricUpdaterTest { ContainerWatchdogMetrics containerWatchdogMetrics = mock(ContainerWatchdogMetrics.class); new MetricUpdater(new MockScheduler(), metric, containerWatchdogMetrics); verify(containerWatchdogMetrics, times(1)).emitMetrics(any()); - verify(metric, times(8 + 2 * gcCount)).set(anyString(), any(), any()); + verify(metric, times(5 + 2 * gcCount)).set(anyString(), any(), any()); } private static class MockScheduler implements MetricUpdater.Scheduler { |