Improved Graphite reporting

orbit · Jun 18, 2015 · 40a57e4 · 40a57e4
1 parent 7b3cb64
commit 40a57e4
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 28 deletions.
diff --git a/actors/metrics/pom.xml b/actors/metrics/pom.xml
@@ -44,7 +44,7 @@
     <version>0.3.2-SNAPSHOT</version>
 
     <properties>
-        <metrics.version>3.1.0</metrics.version>
+        <metrics.version>3.1.2</metrics.version>
     </properties>
 
     <dependencies>
@@ -65,7 +65,6 @@
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-graphite</artifactId>
             <version>${metrics.version}</version>
-            <optional>true</optional>
         </dependency>
 
         <dependency>

diff --git a/actors/metrics/src/main/java/com/ea/orbit/actors/metrics/MetricsManager.java b/actors/metrics/src/main/java/com/ea/orbit/actors/metrics/MetricsManager.java
@@ -61,7 +61,7 @@ public class MetricsManager
 
     public synchronized void initializeMetrics(String uniqueId)
     {
-        if (!isInitialized)
+        if (!isInitialized && reporterConfigs != null)
         {
             for (ReporterConfig reporterConfig : reporterConfigs)
             {

diff --git a/...ics/src/main/java/com/ea/orbit/actors/metrics/config/reporters/GangliaReporterConfig.java b/...ics/src/main/java/com/ea/orbit/actors/metrics/config/reporters/GangliaReporterConfig.java
@@ -68,20 +68,15 @@ public void setPort(final int port)
     }
 
     @Override
-    public void enableReporter(MetricRegistry registry, String uniqueId)
+    public void enableReporter(MetricRegistry registry, String runtimeId)
     {
-        if (getPrefix() == null || getPrefix().isEmpty())
-        {
-            setPrefix(uniqueId);
-        }
-
         try
         {
             final GMetric ganglia = new GMetric(host, port, GMetric.UDPAddressingMode.MULTICAST,1);
             final GangliaReporter reporter = GangliaReporter.forRegistry(registry)
                     .convertRatesTo(getRateTimeUnit())
                     .convertDurationsTo(getDurationTimeUnit())
-                    .prefixedWith(getPrefix())
+                    .prefixedWith(buildUniquePrefix(runtimeId))
                     .build(ganglia);
 
             reporter.start(getPeriod(), getPeriodTimeUnit());

diff --git a/...cs/src/main/java/com/ea/orbit/actors/metrics/config/reporters/GraphiteReporterConfig.java b/...cs/src/main/java/com/ea/orbit/actors/metrics/config/reporters/GraphiteReporterConfig.java
@@ -28,6 +28,9 @@
 
 package com.ea.orbit.actors.metrics.config.reporters;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.graphite.Graphite;
 import com.codahale.metrics.graphite.GraphiteReporter;
@@ -36,7 +39,7 @@
 
 public class GraphiteReporterConfig extends ReporterConfig
 {
-
+    private static final Logger logger = LoggerFactory.getLogger(GraphiteReporterConfig.class);
     private String host;
     private int port;
 
@@ -61,18 +64,15 @@ public void setPort(final int port)
     }
 
     @Override
-    public void enableReporter(MetricRegistry registry, String uniqueId)
+    public void enableReporter(MetricRegistry registry, String runtimeId)
     {
-        if (getPrefix() == null || getPrefix().isEmpty())
-        {
-            setPrefix(uniqueId);
-        }
-
+        String uniquePrefix = buildUniquePrefix(runtimeId);
+        logger.info("Registering with Graphite under prefix: " + uniquePrefix);
         final Graphite graphite = new Graphite(new InetSocketAddress(host, port));
         final GraphiteReporter reporter = GraphiteReporter.forRegistry(registry)
                 .convertRatesTo(getRateTimeUnit())
                 .convertDurationsTo(getDurationTimeUnit())
-                .prefixedWith(getPrefix())
+                .prefixedWith(uniquePrefix)
                 .build(graphite);
 
         reporter.start(getPeriod(), getPeriodTimeUnit());

diff --git a/...rs/metrics/src/main/java/com/ea/orbit/actors/metrics/config/reporters/ReporterConfig.java b/...rs/metrics/src/main/java/com/ea/orbit/actors/metrics/config/reporters/ReporterConfig.java
@@ -108,5 +108,18 @@ protected TimeUnit getPeriodTimeUnit()
         return TimeUnit.valueOf(getRateUnit());
     }
 
-    public void enableReporter(MetricRegistry registry, String uniqueId) {};
+    public void enableReporter(MetricRegistry registry, String runtimeId) {};
+
+    protected String buildUniquePrefix(String runtimeId)
+    {
+        StringBuilder uniquePrefix = new StringBuilder();
+        if (getPrefix() != null && !getPrefix().isEmpty())
+        {
+            uniquePrefix.append(getPrefix());
+            uniquePrefix.append(".");
+        }
+        uniquePrefix.append(runtimeId);
+
+        return uniquePrefix.toString();
+    }
 }
diff --git a/...trics/src/main/java/com/ea/orbit/actors/metrics/config/reporters/Slf4jReporterConfig.java b/...trics/src/main/java/com/ea/orbit/actors/metrics/config/reporters/Slf4jReporterConfig.java
@@ -46,13 +46,8 @@ public void setLoggerName(final String loggerName)
     }
 
     @Override
-    public void enableReporter(MetricRegistry registry, String uniqueId)
+    public void enableReporter(MetricRegistry registry, String runtimeId)
     {
-        if (getPrefix() == null || getPrefix().isEmpty())
-        {
-            setPrefix(uniqueId);
-        }
-
         final Slf4jReporter reporter = Slf4jReporter.forRegistry(registry)
                         .convertRatesTo(getRateTimeUnit())
                 .convertDurationsTo(getDurationTimeUnit())

diff --git a/actors/stage/src/main/java/com/ea/orbit/actors/Stage.java b/actors/stage/src/main/java/com/ea/orbit/actors/Stage.java
@@ -248,7 +248,10 @@ public Task<?> start()
 
         if (metricsManager != null)
         {
-            metricsManager.initializeMetrics(runtimeIdentity());
+            String cleanRuntimeId = runtimeIdentity().replaceAll("[\\[\\]\\.\\\\/]", ""); //strip illegal characters
+            cleanRuntimeId = cleanRuntimeId.replace("Orbit","");
+            cleanRuntimeId = getClusterName() + "." + getNodeName() + "." + cleanRuntimeId;
+            metricsManager.initializeMetrics(cleanRuntimeId);
             metricsManager.registerExportedMetrics(execution);
         }
 

diff --git a/samples/chat/chat-actors/src/main/resources/conf/orbit.yaml b/samples/chat/chat-actors/src/main/resources/conf/orbit.yaml
@@ -41,7 +41,11 @@ orbit.components:
   - com.ea.orbit.actors.server.ServerModule
 
 orbit.metrics.reporters:
+  - !!com.ea.orbit.actors.metrics.config.reporters.GraphiteReporterConfig
+    period: 1
+    periodUnit: 'SECONDS'
+    host: graphite-int.fieldflux.ca
+    port: 2003
   - !!com.ea.orbit.actors.metrics.config.reporters.Slf4jReporterConfig
     period: 1
     periodUnit: 'SECONDS'
-    loggerName: metrics
diff --git a/samples/chat/chat-actors/src/main/resources/logback.xml b/samples/chat/chat-actors/src/main/resources/logback.xml
@@ -6,7 +6,7 @@
         </encoder>
     </appender>
 
-    <root level="info">
+    <root level="debug">
         <appender-ref ref="STDOUT"/>
     </root>
 </configuration>