From 7c00b99fe9cfc3132ddad0226c2613adf2ea4d5d Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Tue, 26 Jan 2021 12:04:26 +0100
Subject: Remove the StateMetricConsumer class and its factory.

---
 .../container/jdisc/state/StateMetricConsumer.java | 50 ----------------------
 .../yahoo/container/jdisc/state/StateMonitor.java  |  6 ---
 .../metric/state/StateMetricConsumerFactory.java   | 24 -----------
 3 files changed, 80 deletions(-)
 delete mode 100644 container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricConsumer.java
 delete mode 100644 container-disc/src/main/java/com/yahoo/container/jdisc/metric/state/StateMetricConsumerFactory.java

diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricConsumer.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricConsumer.java
deleted file mode 100644
index dfa791304e0..00000000000
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMetricConsumer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.jdisc.state;
-
-import com.yahoo.jdisc.Metric;
-import com.yahoo.jdisc.application.MetricConsumer;
-
-import java.util.Map;
-
-/**
- * @author Simon Thoresen Hult
- */
-final class StateMetricConsumer implements MetricConsumer {
-
-    final static Metric.Context NULL_CONTEXT = StateMetricContext.newInstance(null);
-    private final Object lock = new Object();
-    private MetricSnapshot metricSnapshot = new MetricSnapshot();
-
-    @Override
-    public void set(String key, Number val, Metric.Context ctx) {
-        synchronized (lock) {
-            metricSnapshot.set(dimensionsOrDefault(ctx), key, val);
-        }
-    }
-
-    private MetricDimensions dimensionsOrDefault(Metric.Context ctx) {
-        return (MetricDimensions)(ctx != null ? ctx : NULL_CONTEXT);
-    }
-
-    @Override
-    public void add(String key, Number val, Metric.Context ctx) {
-        synchronized (lock) {
-            metricSnapshot.add(dimensionsOrDefault(ctx), key, val);
-        }
-    }
-
-    @Override
-    public Metric.Context createContext(Map<String, ?> properties) {
-        return StateMetricContext.newInstance(properties);
-    }
-
-    MetricSnapshot createSnapshot() {
-        MetricSnapshot metricSnapshot;
-        synchronized (lock) {
-            metricSnapshot = this.metricSnapshot;
-            this.metricSnapshot = this.metricSnapshot.createSnapshot();
-        }
-        return metricSnapshot;
-    }
-
-}
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java
index 93c757ece18..027ce02a2aa 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java
@@ -4,7 +4,6 @@ package com.yahoo.container.jdisc.state;
 import com.google.inject.Inject;
 import com.yahoo.component.AbstractComponent;
 import com.yahoo.container.jdisc.config.HealthMonitorConfig;
-import com.yahoo.jdisc.application.MetricConsumer;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -31,11 +30,6 @@ public class StateMonitor extends AbstractComponent {
         return new StateMonitor(new HealthMonitorConfig.Builder().build());
     }
 
-    /** TODO: Remove */
-    public MetricConsumer newMetricConsumer() {
-        return new StateMetricConsumer();
-    }
-
     public void status(Status status) {
         if (status != this.status) {
             log.log(Level.INFO, "Changing health status code from '" + this.status + "' to '" + status.name() + "'");
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/state/StateMetricConsumerFactory.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/state/StateMetricConsumerFactory.java
deleted file mode 100644
index d1cf660f571..00000000000
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/state/StateMetricConsumerFactory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.jdisc.metric.state;
-
-import com.yahoo.container.jdisc.MetricConsumerFactory;
-import com.yahoo.container.jdisc.state.StateMonitor;
-import com.yahoo.jdisc.application.MetricConsumer;
-
-/**
- * @author Simon Thoresen Hult
- */
-public class StateMetricConsumerFactory implements MetricConsumerFactory {
-
-    private final StateMonitor stateMonitor;
-
-    public StateMetricConsumerFactory(StateMonitor stateMonitor) {
-        this.stateMonitor = stateMonitor;
-    }
-
-    @Override
-    public MetricConsumer newInstance() {
-        return stateMonitor.newMetricConsumer();
-    }
-
-}
-- 
cgit v1.2.3