address review comments

#1071
Graylog2 · Mar 31, 2015 · 6791ea8 · 6791ea8
1 parent e075b8d
commit 6791ea8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/graylog2-plugin-interfaces/src/main/java/org/graylog2/plugin/GlobalMetricNames.java b/graylog2-plugin-interfaces/src/main/java/org/graylog2/plugin/GlobalMetricNames.java
@@ -24,7 +24,9 @@
 
 import static com.codahale.metrics.MetricRegistry.name;
 
-public class GlobalMetricNames {
+public final class GlobalMetricNames {
+
+    private GlobalMetricNames() {}
 
     public static final String INPUT_THROUGHPUT = "org.graylog2.throughput.input";
     public static final String INPUT_THROUGHPUT_RATE = name(INPUT_THROUGHPUT, "1-sec-rate");

diff --git a/graylog2-server/src/main/java/org/graylog2/buffers/processors/OutputBufferProcessor.java b/graylog2-server/src/main/java/org/graylog2/buffers/processors/OutputBufferProcessor.java
@@ -53,8 +53,8 @@ public class OutputBufferProcessor implements WorkHandler<MessageEvent> {
 
     private static final Logger LOG = LoggerFactory.getLogger(OutputBufferProcessor.class);
 
-    public static final String INCOMING_MESSAGES_METRICNAME = name(OutputBufferProcessor.class, "incomingMessages");
+    private static final String INCOMING_MESSAGES_METRICNAME = name(OutputBufferProcessor.class, "incomingMessages");
-    public static final String PROCESS_TIME_METRICNAME = name(OutputBufferProcessor.class, "processTime");
+    private static final String PROCESS_TIME_METRICNAME = name(OutputBufferProcessor.class, "processTime");
 
     private final ExecutorService executor;
 

diff --git a/graylog2-server/src/main/java/org/graylog2/outputs/ElasticSearchOutput.java b/graylog2-server/src/main/java/org/graylog2/outputs/ElasticSearchOutput.java
@@ -42,8 +42,8 @@
 import static com.codahale.metrics.MetricRegistry.name;
 
 public class ElasticSearchOutput implements MessageOutput {
-    public static final String WRITES_METRICNAME = name(ElasticSearchOutput.class, "writes");
+    private static final String WRITES_METRICNAME = name(ElasticSearchOutput.class, "writes");
-    public static final String PROCESS_TIME_METRICNAME = name(ElasticSearchOutput.class, "processTime");
+    private static final String PROCESS_TIME_METRICNAME = name(ElasticSearchOutput.class, "processTime");
 
     private static final String NAME = "ElasticSearch Output";
     private static final Logger LOG = LoggerFactory.getLogger(ElasticSearchOutput.class);

diff --git a/graylog2-shared/src/main/java/org/graylog2/periodical/ThroughputCalculator.java b/graylog2-shared/src/main/java/org/graylog2/periodical/ThroughputCalculator.java
@@ -20,14 +20,13 @@
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.Iterables;
-import org.graylog2.plugin.periodical.Periodical;
 import org.graylog2.plugin.GlobalMetricNames;
+import org.graylog2.plugin.periodical.Periodical;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import java.util.SortedMap;
-import java.util.concurrent.atomic.AtomicLong;
 
 import static org.graylog2.shared.metrics.MetricUtils.filterSingleMetric;
 
@@ -36,9 +35,9 @@ public class ThroughputCalculator extends Periodical {
 
     private final MetricRegistry metricRegistry;
     private long prevOutputCount = 0;
-    private final AtomicLong outputCountAvgLastSecond = new AtomicLong(0);
+    private volatile long outputCountAvgLastSecond = 0L;
     private long prevInputCount = 0;
-    private AtomicLong inputCountAvgLastSecond = new AtomicLong(0);
+    private volatile long inputCountAvgLastSecond = 0L;
 
     @Inject
     public ThroughputCalculator(MetricRegistry metricRegistry) {
@@ -47,14 +46,14 @@ public ThroughputCalculator(MetricRegistry metricRegistry) {
             metricRegistry.register(GlobalMetricNames.OUTPUT_THROUGHPUT_RATE, new Gauge<Long>() {
                 @Override
                 public Long getValue() {
-                    return outputCountAvgLastSecond.get();
+                    return outputCountAvgLastSecond;
                 }
             });
 
             metricRegistry.register(GlobalMetricNames.INPUT_THROUGHPUT_RATE, new Gauge<Long>() {
                 @Override
                 public Long getValue() {
-                    return inputCountAvgLastSecond.get();
+                    return inputCountAvgLastSecond;
                 }
             });
 
@@ -114,7 +113,7 @@ public void doRun() {
             log.debug("Could not find throughput meter '{}'. Trying again later.", GlobalMetricNames.OUTPUT_THROUGHPUT);
         } else {
             final long currentOutputThroughput = outputThroughput.getCount();
-            outputCountAvgLastSecond.set(currentOutputThroughput - prevOutputCount);
+            outputCountAvgLastSecond = currentOutputThroughput - prevOutputCount;
             prevOutputCount = currentOutputThroughput;
         }
 
@@ -128,7 +127,7 @@ public void doRun() {
             log.debug("Could not find throughput meter '{}'. Trying again later.", GlobalMetricNames.INPUT_THROUGHPUT);
         } else {
             final long currentInputThroughput = inputThroughput.getCount();
-            inputCountAvgLastSecond.set(currentInputThroughput - prevInputCount);
+            inputCountAvgLastSecond = currentInputThroughput - prevInputCount;
             prevInputCount = currentInputThroughput;
         }
     }