Remove some unused metrics code and dewire it.

11 files changed, 13 insertions, 204 deletions

diff --git a/messagebus/abi-spec.json b/messagebus/abi-spec.json
index 54c5c782cb5..baf2046e322 100644
--- a/messagebus/abi-spec.json
+++ b/messagebus/abi-spec.json
@@ -611,8 +611,7 @@
       "public abstract java.lang.String getName()",
       "public abstract byte[] encode(com.yahoo.component.Version, com.yahoo.messagebus.Routable)",
       "public abstract com.yahoo.messagebus.Routable decode(com.yahoo.component.Version, byte[])",
-      "public abstract com.yahoo.messagebus.routing.RoutingPolicy createPolicy(java.lang.String, java.lang.String)",
-      "public abstract com.yahoo.messagebus.metrics.MetricSet getMetrics()"
+      "public abstract com.yahoo.messagebus.routing.RoutingPolicy createPolicy(java.lang.String, java.lang.String)"
     ],
     "fields": []
   },
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java b/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java
index 11b135cac62..3801308d38f 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java
@@ -2,7 +2,6 @@
 package com.yahoo.messagebus;
 
 import com.yahoo.component.Version;
-import com.yahoo.messagebus.metrics.MetricSet;
 import com.yahoo.messagebus.routing.RoutingPolicy;
 
 /**
@@ -46,9 +45,4 @@ public interface Protocol {
      * @return The created policy.
      */
     public RoutingPolicy createPolicy(String name, String param);
-
-    /**
-     * Returns the metrics associated with this protocol.
-     */
-    MetricSet getMetrics();
 }
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/metrics/CountMetric.java b/messagebus/src/main/java/com/yahoo/messagebus/metrics/CountMetric.java
deleted file mode 100644
index e403a528c98..00000000000
--- a/messagebus/src/main/java/com/yahoo/messagebus/metrics/CountMetric.java
+++ /dev/null
@@ -1,18 +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.messagebus.metrics;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * @author thomasg
- */
-public class CountMetric extends NumberMetric<AtomicLong> {
-    public CountMetric(String name, MetricSet owner) {
-        super(name, new AtomicLong(0), owner);
-    }
-
-    public void inc(long increment) {
-        get().addAndGet(increment);
-    }
-
-}
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/metrics/Metric.java b/messagebus/src/main/java/com/yahoo/messagebus/metrics/Metric.java
deleted file mode 100644
index 004f48e43f0..00000000000
--- a/messagebus/src/main/java/com/yahoo/messagebus/metrics/Metric.java
+++ /dev/null
@@ -1,48 +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.messagebus.metrics;
-
-import com.yahoo.text.XMLWriter;
-import com.yahoo.text.Utf8String;
-
-import java.io.Writer;
-
-/**
- * @author thomasg
- */
-public abstract class Metric {
-    String name;
-    String xmlTagName = null;
-
-    public Metric(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String toHTML() {
-        return toString();
-    }
-
-    public String getXmlTagName() {
-        return xmlTagName;
-    }
-
-    public void setXmlTagName(String newName) {
-        xmlTagName = newName;
-    }
-
-    static private final Utf8String attrName = new Utf8String("name");
-
-    public void renderXmlName(XMLWriter writer) {
-        if (xmlTagName != null) {
-            writer.openTag(xmlTagName);
-            writer.attribute(attrName, name);
-        } else {
-            writer.openTag(name);
-        }
-    }
-
-    public abstract void toXML(XMLWriter writer);
-}
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/metrics/MetricSet.java b/messagebus/src/main/java/com/yahoo/messagebus/metrics/MetricSet.java
deleted file mode 100644
index 44264246b3a..00000000000
--- a/messagebus/src/main/java/com/yahoo/messagebus/metrics/MetricSet.java
+++ /dev/null
@@ -1,47 +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.messagebus.metrics;
-
-import com.yahoo.text.XMLWriter;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author thomasg
- */
-public class MetricSet extends Metric {
-    private List<Metric> metrics = new ArrayList<Metric>();
-
-    public MetricSet(String name) {
-        super(name);
-    }
-
-    public void addMetric(Metric m) {
-        metrics.add(m);
-    }
-
-    public List<Metric> getMetrics() {
-        return Collections.unmodifiableList(metrics);
-    }
-
-    public String toHTML() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("<ul>\n");
-        for (Metric m : metrics) {
-            builder.append("<li>\n").append(m.toHTML()).append("\n</li>");
-        }
-        builder.append("\n</ul>\n");
-        return builder.toString();
-    }
-
-    public void toXML(XMLWriter xmlWriter) {
-        renderXmlName(xmlWriter);
-
-        for (Metric m : metrics) {
-            m.toXML(xmlWriter);
-        }
-
-        xmlWriter.closeTag();
-    }
-}
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/metrics/NumberMetric.java b/messagebus/src/main/java/com/yahoo/messagebus/metrics/NumberMetric.java
deleted file mode 100644
index 5caf300cbb0..00000000000
--- a/messagebus/src/main/java/com/yahoo/messagebus/metrics/NumberMetric.java
+++ /dev/null
@@ -1,40 +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.messagebus.metrics;
-
-import com.yahoo.text.XMLWriter;
-import com.yahoo.text.Utf8String;
-
-/**
- * @author thomasg
- */
-public abstract class NumberMetric<V extends Number> extends Metric {
-    private V value;
-
-    public NumberMetric(String name, V v, MetricSet owner) {
-        super(name);
-        value = v;
-        owner.addMetric(this);
-    }
-
-    public V get() {
-        return value;
-    }
-
-    public void set(V value) {
-        this.value = value;
-    }
-
-    public String toString() {
-        return value.toString();
-    }
-
-    static private final Utf8String attrValue = new Utf8String("value");
-
-    public void toXML(XMLWriter writer) {
-        renderXmlName(writer);
-        writer.attribute(attrValue, value);
-        writer.closeTag();
-    }
-
-
-}
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/metrics/ValueMetric.java b/messagebus/src/main/java/com/yahoo/messagebus/metrics/ValueMetric.java
deleted file mode 100644
index 8905a3eadd3..00000000000
--- a/messagebus/src/main/java/com/yahoo/messagebus/metrics/ValueMetric.java
+++ /dev/null
@@ -1,14 +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.messagebus.metrics;
-
-import java.io.Writer;
-
-/**
- * @author thomasg
- */
-public class ValueMetric<V extends Number> extends NumberMetric<V> {
-
-    public ValueMetric(String name, V v, MetricSet owner) {
-        super(name, v, owner);
-    }
-}
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/metrics/package-info.java b/messagebus/src/main/java/com/yahoo/messagebus/metrics/package-info.java
deleted file mode 100644
index 9c425f0a0df..00000000000
--- a/messagebus/src/main/java/com/yahoo/messagebus/metrics/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-package com.yahoo.messagebus.metrics;
-
-import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/test/SimpleProtocol.java b/messagebus/src/main/java/com/yahoo/messagebus/test/SimpleProtocol.java
index c4673685767..fc8ccd988c5 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/test/SimpleProtocol.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/test/SimpleProtocol.java
@@ -2,20 +2,13 @@
 package com.yahoo.messagebus.test;
 
 import com.yahoo.component.Version;
-import com.yahoo.messagebus.EmptyReply;
 import com.yahoo.messagebus.Protocol;
-import com.yahoo.messagebus.Reply;
 import com.yahoo.messagebus.Routable;
-import com.yahoo.messagebus.metrics.MetricSet;
-import com.yahoo.messagebus.routing.Route;
-import com.yahoo.messagebus.routing.RoutingContext;
-import com.yahoo.messagebus.routing.RoutingNodeIterator;
 import com.yahoo.messagebus.routing.RoutingPolicy;
 import com.yahoo.text.Utf8;
 import com.yahoo.text.Utf8String;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -68,11 +61,6 @@ public class SimpleProtocol implements Protocol {
         }
     }
 
-    @Override
-    public MetricSet getMetrics() {
-        return null;
-    }
-
     /**
      * Registers a policy factory with this protocol under a given name. Whenever a policy is requested that matches
      * this name, the factory is invoked.
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/RPCNetworkTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/RPCNetworkTestCase.java
index 01e0fbf34b6..bc109a6074f 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/RPCNetworkTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/RPCNetworkTestCase.java
@@ -3,8 +3,15 @@ package com.yahoo.messagebus.network.rpc;
 
 import com.yahoo.component.Version;
 import com.yahoo.jrt.slobrok.server.Slobrok;
-import com.yahoo.messagebus.*;
-import com.yahoo.messagebus.metrics.MetricSet;
+import com.yahoo.messagebus.DestinationSession;
+import com.yahoo.messagebus.DestinationSessionParams;
+import com.yahoo.messagebus.Message;
+import com.yahoo.messagebus.MessageBusParams;
+import com.yahoo.messagebus.Protocol;
+import com.yahoo.messagebus.Reply;
+import com.yahoo.messagebus.Routable;
+import com.yahoo.messagebus.SourceSession;
+import com.yahoo.messagebus.SourceSessionParams;
 import com.yahoo.messagebus.network.rpc.test.TestServer;
 import com.yahoo.messagebus.routing.Route;
 import com.yahoo.messagebus.routing.RoutingPolicy;
@@ -88,11 +95,6 @@ public class RPCNetworkTestCase {
             return null;
         }
 
-        @Override
-        public MetricSet getMetrics() {
-            return null;
-        }
-
         static MyProtocol newEncodeException(RuntimeException e) {
             return new MyProtocol(e);
         }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleProtocolTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleProtocolTestCase.java
index 898d5a36431..c6b3b09f2ed 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleProtocolTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleProtocolTestCase.java
@@ -6,7 +6,9 @@ import com.yahoo.messagebus.EmptyReply;
 import com.yahoo.messagebus.Routable;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Simon Thoresen Hult
@@ -21,10 +23,6 @@ public class SimpleProtocolTestCase {
         assertEquals(SimpleProtocol.NAME, PROTOCOL.getName());
     }
 
-    @Test
-    public void requireThatMetricSetIsNull() {
-        assertNull(PROTOCOL.getMetrics());
-    }
 
     @Test
     public void requireThatMessageCanBeEncodedAndDecoded() {