Have the stage pass in the runtime Id for unique prefixing

orbit · Jun 5, 2015 · fa2beab · fa2beab
1 parent 421df72
commit fa2beab
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 15 deletions.
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
@@ -31,14 +31,11 @@
 import com.ea.orbit.actors.metrics.annotations.ExportMetric;
 import com.ea.orbit.actors.metrics.config.reporters.ReporterConfig;
 import com.ea.orbit.annotation.Config;
-import com.ea.orbit.container.Container;
 import com.ea.orbit.exception.UncheckedException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import com.codahale.metrics.Gauge;
@@ -56,21 +53,22 @@ public class MetricsManager
 {
     static final MetricRegistry registry = new MetricRegistry();
     private static final Logger logger = LoggerFactory.getLogger(MetricsManager.class);
+    private boolean isInitialized = false;
 
     @Config("orbit.metrics.reporters")
     private List<ReporterConfig> reporterConfigs;
 
-    @Inject
-    Container container;
 
-    @PostConstruct
-    protected void initializeMetrics()
+    public synchronized void initializeMetrics(String uniqueId)
     {
-        for (ReporterConfig reporterConfig : reporterConfigs)
+        if (!isInitialized)
         {
-            reporterConfig.enableReporter(registry);
+            for (ReporterConfig reporterConfig : reporterConfigs)
+            {
+                reporterConfig.enableReporter(registry, uniqueId);
+            }
+            isInitialized = true;
         }
-        logger.warn(Integer.toString(reporterConfigs.size()));
     }
 
     public <T> void registerMetric(Class clazz, String name, Supplier<T> value)

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,14 +68,20 @@ public void setPort(final int port)
     }
 
     @Override
-    public void enableReporter(MetricRegistry registry)
+    public void enableReporter(MetricRegistry registry, String uniqueId)
     {
+        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())
                     .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
@@ -61,12 +61,18 @@ public void setPort(final int port)
     }
 
     @Override
-    public void enableReporter(MetricRegistry registry)
+    public void enableReporter(MetricRegistry registry, String uniqueId)
     {
+        if (getPrefix() == null || getPrefix().isEmpty())
+        {
+            setPrefix(uniqueId);
+        }
+
         final Graphite graphite = new Graphite(new InetSocketAddress(host, port));
         final GraphiteReporter reporter = GraphiteReporter.forRegistry(registry)
                 .convertRatesTo(getRateTimeUnit())
                 .convertDurationsTo(getDurationTimeUnit())
+                .prefixedWith(getPrefix())
                 .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
@@ -29,7 +29,6 @@
 package com.ea.orbit.actors.metrics.config.reporters;
 
 import com.codahale.metrics.MetricRegistry;
-
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -42,6 +41,18 @@ public abstract class ReporterConfig
     private String rateUnit = "SECONDS";
     private String durationUnit = "MILLISECONDS";
 
+    private String prefix = "";
+
+    public String getPrefix()
+    {
+        return prefix;
+    }
+
+    public void setPrefix(final String prefix)
+    {
+        this.prefix = prefix;
+    }
+
     public int getPeriod()
     {
         return period;
@@ -97,5 +108,5 @@ protected TimeUnit getPeriodTimeUnit()
         return TimeUnit.valueOf(getRateUnit());
     }
 
-    public void enableReporter(MetricRegistry registry) {};
+    public void enableReporter(MetricRegistry registry, String uniqueId) {};
 }
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,8 +46,12 @@ public void setLoggerName(final String loggerName)
     }
 
     @Override
-    public void enableReporter(MetricRegistry registry)
+    public void enableReporter(MetricRegistry registry, String uniqueId)
     {
+        if (getPrefix() == null || getPrefix().isEmpty())
+        {
+            setPrefix(uniqueId);
+        }
 
         final Slf4jReporter reporter = Slf4jReporter.forRegistry(registry)
                         .convertRatesTo(getRateTimeUnit())

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
@@ -247,7 +247,10 @@ public Task<?> start()
         execution.start();
 
         if (metricsManager != null)
+        {
+            metricsManager.initializeMetrics(runtimeIdentity());
             metricsManager.registerExportedMetrics(execution);
+        }
 
         Task<?> future = clusterPeer.join(clusterName, nodeName);
         if (mode == StageMode.HOST)