Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClientCommand.java b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClientCommand.java
index 049e71f..2af0c13 100644
--- a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClientCommand.java
+++ b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClientCommand.java
@@ -24,7 +24,7 @@
@Argument(index = 1, name = "warmupCount", description = "Warm-up count",
required = false, multiValued = false)
- String warmup = "10000";
+ String warmup = "1000";
@Argument(index = 2, name = "messageCount", description = "Message count",
required = false, multiValued = false)
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java
index c0eb014..5578fcd 100644
--- a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java
+++ b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java
@@ -8,7 +8,7 @@
* Test to measure Messaging performance.
*/
public final class SimpleNettyServer {
- private static Logger log = LoggerFactory.getLogger(IOLoopTestServer.class);
+ private static Logger log = LoggerFactory.getLogger(SimpleNettyServer.class);
private SimpleNettyServer() {}
diff --git a/utils/misc/src/main/java/org/onlab/metrics/MetricsManager.java b/utils/misc/src/main/java/org/onlab/metrics/MetricsManager.java
index eaf2a54..b098513 100644
--- a/utils/misc/src/main/java/org/onlab/metrics/MetricsManager.java
+++ b/utils/misc/src/main/java/org/onlab/metrics/MetricsManager.java
@@ -8,8 +8,9 @@
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import com.codahale.metrics.ConsoleReporter;
import com.codahale.metrics.Counter;
import com.codahale.metrics.Gauge;
import com.codahale.metrics.Histogram;
@@ -17,6 +18,7 @@
import com.codahale.metrics.Metric;
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.Slf4jReporter;
import com.codahale.metrics.Timer;
/**
@@ -54,6 +56,7 @@
@Component(immediate = true)
public final class MetricsManager implements MetricsService {
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* Registry to hold the Components defined in the system.
*/
@@ -67,14 +70,16 @@
/**
* Default Reporter for this metrics manager.
*/
- private final ConsoleReporter reporter;
+ private final Slf4jReporter reporter;
public MetricsManager() {
this.metricsRegistry = new MetricRegistry();
- this.reporter = ConsoleReporter.forRegistry(metricsRegistry)
+ this.reporter = Slf4jReporter.forRegistry(this.metricsRegistry)
+ .outputTo(log)
.convertRatesTo(TimeUnit.SECONDS)
- .convertDurationsTo(TimeUnit.MICROSECONDS)
+ .convertDurationsTo(TimeUnit.NANOSECONDS)
.build();
+ reporter.start(1, TimeUnit.MINUTES);
}
@Activate