Extract building connections metric name into a method

Reduce duplicate code across all HTTP connection factories.
dropwizard · Dec 28, 2014 · 2380624 · 2380624
1 parent a1d751f
commit 2380624
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/dropwizard-jetty/src/main/java/io/dropwizard/jetty/HttpConnectorFactory.java b/dropwizard-jetty/src/main/java/io/dropwizard/jetty/HttpConnectorFactory.java
@@ -434,13 +434,16 @@ public Connector build(Server server,
 
         final ByteBufferPool bufferPool = buildBufferPool();
 
-        final String timerName = name(HttpConnectionFactory.class,
-                                      bindHost,
-                                      Integer.toString(port),
-                                      "connections");
         return buildConnector(server, scheduler, bufferPool, name, threadPool,
                               new InstrumentedConnectionFactory(httpConnectionFactory,
-                                                                metrics.timer(timerName)));
+                                                                metrics.timer(httpConnections())));
+    }
+
+    /**
+     * Get name of the timer that tracks incoming HTTP connections
+     */
+    protected String httpConnections() {
+        return name(HttpConnectionFactory.class,  bindHost, Integer.toString(port), "connections");
     }
 
     protected ServerConnector buildConnector(Server server,

diff --git a/dropwizard-jetty/src/main/java/io/dropwizard/jetty/HttpsConnectorFactory.java b/dropwizard-jetty/src/main/java/io/dropwizard/jetty/HttpsConnectorFactory.java
@@ -545,14 +545,9 @@ public Connector build(Server server, MetricRegistry metrics, String name, Threa
 
         final ByteBufferPool bufferPool = buildBufferPool();
 
-        final String timerName = name(HttpConnectionFactory.class,
-                                      getBindHost(),
-                                      Integer.toString(getPort()),
-                                      "connections");
-
         return buildConnector(server, scheduler, bufferPool, name, threadPool,
                               new InstrumentedConnectionFactory(sslConnectionFactory,
-                                                                metrics.timer(timerName)),
+                                                                metrics.timer(httpConnections())),
                               httpConnectionFactory);
     }
 

diff --git a/dropwizard-spdy/src/main/java/io/dropwizard/spdy/Spdy3ConnectorFactory.java b/dropwizard-spdy/src/main/java/io/dropwizard/spdy/Spdy3ConnectorFactory.java
@@ -9,7 +9,6 @@
 import org.eclipse.jetty.io.ByteBufferPool;
 import org.eclipse.jetty.server.*;
 import org.eclipse.jetty.spdy.api.SPDY;
-import org.eclipse.jetty.spdy.server.NPNServerConnectionFactory;
 import org.eclipse.jetty.spdy.server.http.HTTPSPDYServerConnectionFactory;
 import org.eclipse.jetty.spdy.server.http.PushStrategy;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -93,11 +92,8 @@ public Connector build(Server server, MetricRegistry metrics, String name, Threa
 
         final ByteBufferPool bufferPool = buildBufferPool();
 
-        final String timerName = name(HttpConnectionFactory.class, getBindHost(), Integer.toString(getPort()),
-                "connections");
-
         return buildConnector(server, scheduler, bufferPool, name, threadPool,
-                new InstrumentedConnectionFactory(sslConnectionFactory, metrics.timer(timerName)),
+                new InstrumentedConnectionFactory(sslConnectionFactory, metrics.timer(httpConnections())),
                 negotiatingFactory,
                 spdyFactory,
                 httpConnectionFactory);