Remove MetricsFilter and NoMetricsFilter

3 files changed, 2 insertions, 75 deletions

diff --git a/logserver/src/main/java/com/yahoo/logserver/filter/LogFilterManager.java b/logserver/src/main/java/com/yahoo/logserver/filter/LogFilterManager.java
index 66de14a071b..b343758b2bf 100644
--- a/logserver/src/main/java/com/yahoo/logserver/filter/LogFilterManager.java
+++ b/logserver/src/main/java/com/yahoo/logserver/filter/LogFilterManager.java
@@ -1,11 +1,11 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.logserver.filter;
 
+import com.yahoo.log.LogLevel;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import com.yahoo.log.LogLevel;
-
 /**
  * The LogFilterManager keeps track of associations between
  * LogFilter names and instances, so that access to filters
@@ -23,8 +23,6 @@ public class LogFilterManager {
         LevelFilter allEvents = new LevelFilter();
         allEvents.addLevel(LogLevel.EVENT);
         instance.addLogFilterInternal("system.allevents", allEvents);
-        instance.addLogFilterInternal("system.metricsevents", new MetricsFilter());
-        instance.addLogFilterInternal("system.nometricsevents", new NoMetricsFilter());
         instance.addLogFilterInternal("system.all", new NullFilter());
         instance.addLogFilterInternal("system.mute", MuteFilter.getInstance());
     }
diff --git a/logserver/src/main/java/com/yahoo/logserver/filter/MetricsFilter.java b/logserver/src/main/java/com/yahoo/logserver/filter/MetricsFilter.java
deleted file mode 100644
index 38c3d4ebee1..00000000000
--- a/logserver/src/main/java/com/yahoo/logserver/filter/MetricsFilter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.logserver.filter;
-
-import com.yahoo.log.LogLevel;
-import com.yahoo.log.event.Count;
-import com.yahoo.log.event.CountGroup;
-import com.yahoo.log.event.Event;
-import com.yahoo.log.event.Histogram;
-import com.yahoo.log.event.MalformedEventException;
-import com.yahoo.log.event.Value;
-import com.yahoo.log.event.ValueGroup;
-import com.yahoo.log.LogMessage;
-
-/**
- * This filter matches events that are used for monitoring, specificly
- * the Count and Value events.
- *
- * @author Bjorn Borud
- */
-public class MetricsFilter implements LogFilter {
-    public boolean isLoggable (LogMessage msg) {
-        if (msg.getLevel() != LogLevel.EVENT) {
-            return false;
-        }
-
-        Event event;
-        try {
-            event = msg.getEvent();
-        }
-        catch (MalformedEventException e) {
-            return false;
-        }
-
-        // if it is not Count, Value or something which will generate
-        // Count or Value we don't care
-        if (! ((event instanceof Count)
-               || (event instanceof Value)
-               || (event instanceof Histogram)
-               || (event instanceof CountGroup)
-               || (event instanceof ValueGroup))) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public String description () {
-        return "Match all events representing system metrics (Counts, Values, etc).";
-    }
-}
diff --git a/logserver/src/main/java/com/yahoo/logserver/filter/NoMetricsFilter.java b/logserver/src/main/java/com/yahoo/logserver/filter/NoMetricsFilter.java
deleted file mode 100644
index 71782ed8b0a..00000000000
--- a/logserver/src/main/java/com/yahoo/logserver/filter/NoMetricsFilter.java
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.logserver.filter;
-
-import com.yahoo.log.LogMessage;
-
-/**
- * This filter is the complement of MetricsFilter
- *
- * @author  Bjorn Borud
- */
-public class NoMetricsFilter implements LogFilter {
-    private final MetricsFilter filter = new MetricsFilter();
-
-    public boolean isLoggable (LogMessage msg) {
-        return (! filter.isLoggable(msg));
-    }
-
-    public String description () {
-        return "Matches all log messages except Count and Value events";
-    }
-}