1 files changed, 6 insertions, 38 deletions
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/BenchmarkProgressPrinter.java b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/BenchmarkProgressPrinter.java
index 80c7ccb113f..66934b35adc 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/BenchmarkProgressPrinter.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/BenchmarkProgressPrinter.java
@@ -4,9 +4,6 @@ package com.yahoo.vespafeeder;
 import com.yahoo.clientmetrics.MessageTypeMetricSet;
 import com.yahoo.clientmetrics.RouteMetricSet;
 import com.yahoo.concurrent.Timer;
-import com.yahoo.metrics.Metric;
-import com.yahoo.metrics.MetricSet;
-import com.yahoo.metrics.MetricVisitor;
 
 import java.io.PrintStream;
 
@@ -24,51 +21,22 @@ public class BenchmarkProgressPrinter implements RouteMetricSet.ProgressCallback
         this.startTime = timer.milliTime();
     }
 
-    class PrintVisitor extends MetricVisitor {
-        private final PrintStream out;
-
-        PrintVisitor(PrintStream out) {
-            this.out = out;
-        }
-
-        @Override
-        public boolean visitMetricSet(MetricSet set, boolean autoGenerated) {
-            if (set instanceof MessageTypeMetricSet && set.getName().equals("total")) {
-                Metric m = set.getMetric("latency");
-                Metric count = set.getMetric("count");
-                Metric err = set.getMetric("errors.total");
-
-                long okCount = 0, errCount = 0, minLatency = 0, maxLatency = 0, avgLatency = 0;
-
-                if (m != null) {
-                    minLatency = m.getLongValue("min");
-                    maxLatency = m.getLongValue("max");
-                    avgLatency = m.getLongValue("average");
-                }
-                if (count != null) {
-                    okCount = count.getLongValue("count");
-                }
-
-                if (err != null) {
-                    errCount = err.getLongValue("count");
-                }
-                long timeUsed = timer.milliTime() - startTime;
-                out.println(timeUsed + ", " + okCount + ", " + errCount + ", " + minLatency + ", " + maxLatency + ", " + avgLatency);
-            }
-            return true;
+    private void printMetrics(PrintStream out, RouteMetricSet metrics) {
+        for (MessageTypeMetricSet m : metrics.getMetrics().values()) {
+            long timeUsed = timer.milliTime() - startTime;
+            out.println(timeUsed + ", " + m.count + ", " + m.errorCount + ", " + m.latency_min + ", " + m.latency_max + ", " + m.latency_total/Long.max(1L, m.count));
         }
     }
 
     @Override
     public void onProgress(RouteMetricSet metrics) {
-	//metrics.visit(new PrintVisitor(output), false);
     }
 
     @Override
     public void done(RouteMetricSet metrics) {
         try {
-		output.println("# Time used, num ok, num error, min latency, max latency, average latency");
-            metrics.visit(new PrintVisitor(output), false);
+		    output.println("# Time used, num ok, num error, min latency, max latency, average latency");
+            printMetrics(output, metrics);
         } catch (Exception e) {
             e.printStackTrace();
         }