Moving metrics out into its own module under util

actors/pom.xml

@@ -55,7 +55,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <module>extensions/memcached</module>
         <module>test/actor-tests</module>
         <module>actors-all</module>
-        <module>metrics</module>
     </modules>
 
     <dependencies>

actors/stage/pom.xml

@@ -73,7 +73,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
         <dependency>
             <groupId>com.ea.orbit</groupId>
-            <artifactId>orbit-actors-metrics</artifactId>
+            <artifactId>orbit-metrics</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

actors/stage/src/main/java/com/ea/orbit/actors/Stage.java

@@ -34,7 +34,8 @@
 import com.ea.orbit.actors.cluster.NodeAddress;
 import com.ea.orbit.actors.extensions.LifetimeExtension;
 import com.ea.orbit.actors.extensions.ActorExtension;
-import com.ea.orbit.actors.metrics.MetricsManager;
+import com.ea.orbit.metrics.MetricsManager;
+import com.ea.orbit.metrics.config.ReporterConfig;
 import com.ea.orbit.actors.runtime.Execution;
 import com.ea.orbit.actors.runtime.Hosting;
 import com.ea.orbit.actors.runtime.NodeCapabilities;
@@ -53,6 +54,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import java.lang.reflect.Method;
 import java.time.Clock;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -76,12 +78,12 @@ public class Stage implements Startable
     @Config("orbit.actors.extensions")
     private List<ActorExtension> extensions = new ArrayList<>();
 
+    @Config("orbit.metrics.reporters")
+    private List<ReporterConfig> metricsConfig = new ArrayList<>();
+
     @Wired
     Container container;
 
-    @Inject
-    MetricsManager metricsManager;
-
     public enum StageMode
     {
         FRONT_END, // no activations
@@ -246,12 +248,20 @@ public Task<?> start()
         hosting.start();
         execution.start();
 
-        if (metricsManager != null)
+        try
         {
+            Class mmClass = Class.forName("com.ea.orbit.metrics.MetricsManager");
+            Method factoryMethod = mmClass.getDeclaredMethod("getInstance");
+            factoryMethod.invoke(null, null);
+
             String cleanRuntimeId = runtimeIdentity().replace("Orbit", "");
             cleanRuntimeId = MetricsManager.sanitizeMetricName(getClusterName()) + "." + MetricsManager.sanitizeMetricName(getNodeName()) + "." + MetricsManager.sanitizeMetricName(cleanRuntimeId);
-            metricsManager.initializeMetrics(cleanRuntimeId);
-            metricsManager.registerExportedMetrics(execution);
+            MetricsManager.getInstance().initializeMetrics(cleanRuntimeId, metricsConfig);
+            MetricsManager.getInstance().registerExportedMetrics(execution);
+        }
+        catch(Exception ex)
+        {
+
         }
 
         Task<?> future = clusterPeer.join(clusterName, nodeName);

actors/stage/src/main/java/com/ea/orbit/actors/runtime/Execution.java

@@ -40,7 +40,7 @@
 import com.ea.orbit.actors.extensions.LifetimeExtension;
 import com.ea.orbit.actors.extensions.ActorExtension;
 import com.ea.orbit.actors.extensions.InvocationContext;
-import com.ea.orbit.actors.metrics.annotations.ExportMetric;
+import com.ea.orbit.metrics.annotations.ExportMetric;
 import com.ea.orbit.concurrent.ExecutorUtils;
 import com.ea.orbit.concurrent.Task;
 import com.ea.orbit.container.Startable;

commons/pom.xml

@@ -41,5 +41,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     <artifactId>orbit-commons</artifactId>
 
-
+    <dependencies>
+    </dependencies>
 </project>

pom.xml

@@ -49,6 +49,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <module>samples</module>
         <module>packaging/all-docs</module>
         <module>utils/agent-loader</module>
+        <module>utils/metrics</module>
         <module>utils/rest-client</module>
     </modules>
 

samples/chat/chat-actors/src/main/resources/conf/orbit.yaml

@@ -41,6 +41,6 @@ orbit.components:
   - com.ea.orbit.actors.server.ServerModule
 
 orbit.metrics.reporters:
-  - !!com.ea.orbit.actors.metrics.config.reporters.Slf4jReporterConfig
+  - !!com.ea.orbit.metrics.config.Slf4jReporterConfig
     period: 1
     periodUnit: 'MINUTES'

utils/metrics/pom.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~
+Copyright (C) 2015 Electronic Arts Inc.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1.  Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+2.  Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+3.  Neither the name of Electronic Arts, Inc. ("EA") nor the names of
+    its contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY ELECTRONIC ARTS AND ITS CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL ELECTRONIC ARTS OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.ea.orbit</groupId>
+        <artifactId>orbit-parent</artifactId>
+        <version>0.3.2-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+    <artifactId>orbit-metrics</artifactId>
+    <name>Orbit Metrics</name>
+
+    <properties>
+        <metrics.version>3.1.2</metrics.version>
+    </properties>
+
+   <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+       <dependency>
+           <groupId>io.dropwizard.metrics</groupId>
+           <artifactId>metrics-core</artifactId>
+           <version>${metrics.version}</version>
+       </dependency>
+
+       <dependency>
+           <groupId>io.dropwizard.metrics</groupId>
+           <artifactId>metrics-ganglia</artifactId>
+           <version>${metrics.version}</version>
+           <optional>true</optional>
+       </dependency>
+
+       <dependency>
+           <groupId>io.dropwizard.metrics</groupId>
+           <artifactId>metrics-graphite</artifactId>
+           <version>${metrics.version}</version>
+       </dependency>
+
+       <dependency>
+           <groupId>io.dropwizard.metrics</groupId>
+           <artifactId>metrics-healthchecks</artifactId>
+           <version>${metrics.version}</version>
+       </dependency>
+       <dependency>
+           <groupId>com.ea.orbit</groupId>
+           <artifactId>orbit-commons</artifactId>
+           <version>${project.version}</version>
+       </dependency>
+
+   </dependencies>
+
+</project>