Grafana metrics post (#80)

billoneil · web-flow · commit b0a4f205a326 · 2018-08-25T08:50:17.000-04:00
diff --git a/stubbornjava-common/src/main/java/com/stubbornjava/common/Metrics.java b/stubbornjava-common/src/main/java/com/stubbornjava/common/Metrics.java
@@ -7,17 +7,14 @@
 
 import com.amazonaws.util.EC2MetadataUtils;
 import com.codahale.metrics.Meter;
-import com.codahale.metrics.MetricFilter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
-import com.codahale.metrics.graphite.GraphiteReporter;
 import com.codahale.metrics.jvm.CachedThreadStatesGaugeSet;
 import com.codahale.metrics.jvm.GarbageCollectorMetricSet;
 import com.codahale.metrics.jvm.MemoryUsageGaugeSet;
 import com.codahale.metrics.logback.InstrumentedAppender;
 
 import ch.qos.logback.classic.LoggerContext;
-import okhttp3.OkHttpClient;
 
 // {{start:metrics}}
 public class Metrics {
@@ -37,24 +34,8 @@ public class Metrics {
         metrics.start();
         root.addAppender(metrics);
 
-
-        // Graphite reporter to Grafana Cloud
-        OkHttpClient client = new OkHttpClient.Builder()
-            //.addNetworkInterceptor(HttpClient.getLoggingInterceptor())
-            .build();
-
-        String graphiteHost = Configs.properties().getString("metrics.graphite.host");
-        String grafanaApiKey = Configs.properties().getString("metrics.grafana.api_key");
-        final GraphiteHttpSender graphite = new GraphiteHttpSender(client, graphiteHost, grafanaApiKey);
-        final GraphiteReporter reporter = GraphiteReporter.forRegistry(registry)
-                                                          .prefixedWith(metricPrefix("stubbornjava"))
-                                                          .convertRatesTo(TimeUnit.MINUTES)
-                                                          .convertDurationsTo(TimeUnit.MILLISECONDS)
-                                                          .filter(MetricFilter.ALL)
-                                                          .build(graphite);
-        reporter.start(10, TimeUnit.SECONDS);
-
         // Register reporters here.
+        MetricsReporters.startReporters(registry);
     }
 
     public static MetricRegistry registry() {
@@ -69,7 +50,7 @@ public static Meter meter(String first, String... keys) {
         return registry.meter(MetricRegistry.name(first, keys));
     }
 
-    private static String metricPrefix(String app) {
+    static String metricPrefix(String app) {
         Env env = Env.get();
         String host = env == Env.LOCAL ? "localhost" : getHost();
         String prefix = MetricRegistry.name(app, env.getName(), host);
diff --git a/stubbornjava-common/src/main/java/com/stubbornjava/common/MetricsReporters.java b/stubbornjava-common/src/main/java/com/stubbornjava/common/MetricsReporters.java
@@ -0,0 +1,32 @@
+package com.stubbornjava.common;
+
+import java.util.concurrent.TimeUnit;
+
+import com.codahale.metrics.MetricFilter;
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.graphite.GraphiteReporter;
+
+import okhttp3.OkHttpClient;
+
+// {{start:reporters}}
+class MetricsReporters {
+
+    public static void startReporters(MetricRegistry registry) {
+        // Graphite reporter to Grafana Cloud
+        OkHttpClient client = new OkHttpClient.Builder()
+            //.addNetworkInterceptor(HttpClient.getLoggingInterceptor())
+            .build();
+
+        String graphiteHost = Configs.properties().getString("metrics.graphite.host");
+        String grafanaApiKey = Configs.properties().getString("metrics.grafana.api_key");
+        final GraphiteHttpSender graphite = new GraphiteHttpSender(client, graphiteHost, grafanaApiKey);
+        final GraphiteReporter reporter = GraphiteReporter.forRegistry(registry)
+                                                          .prefixedWith(Metrics.metricPrefix("stubbornjava"))
+                                                          .convertRatesTo(TimeUnit.MINUTES)
+                                                          .convertDurationsTo(TimeUnit.MILLISECONDS)
+                                                          .filter(MetricFilter.ALL)
+                                                          .build(graphite);
+        reporter.start(10, TimeUnit.SECONDS);
+    }
+}
+// {{end:reporters}}
