Merge pull request #36 from Peppi-Ressler/statsd-builder

added statsd builder

statsd/src/main/java/com/avast/metrics/statsd/StatsDMetricsMonitor.java

@@ -50,6 +50,12 @@ public StatsDMetricsMonitor(String host, int port, String prefix, final Naming n
         this(host, port, prefix, naming, gaugeSendPeriod, scheduler, MetricsFilter.ALL_ENABLED);
     }
 
+    /**
+     * @deprecated This constructor is only for backward compatibility and should be no longer used.
+     * It internally builds an instance of scheduler that will be never shutted down and causes threads leak.
+     * Prefer to use builder or other constructors.
+     */
+    @Deprecated
     public StatsDMetricsMonitor(String host, int port, String prefix, final Naming naming) {
         this(host, port, prefix, naming, getDefaultGaugeSendPeriod(), createScheduler());
     }
@@ -58,11 +64,22 @@ public StatsDMetricsMonitor(String host, int port, String prefix, final Duration
         this(host, port, prefix, Naming.defaultNaming(), gaugeSendPeriod, scheduler);
     }
 
+    /**
+     * @deprecated This constructor is only for backward compatibility and should be no longer used.
+     * It internally builds an instance of scheduler that will be never shutted down and causes threads leak.
+     * Prefer to use builder or other constructors.
+     */
+    @Deprecated
     public StatsDMetricsMonitor(String host, int port, String prefix) {
         this(host, port, prefix, Naming.defaultNaming(), getDefaultGaugeSendPeriod(), createScheduler());
     }
 
-
+    /**
+     * @deprecated This constructor is only for backward compatibility and should be no longer used.
+     * It internally builds an instance of scheduler that will be never shutted down and causes threads leak.
+     * Prefer to use builder or other constructors.
+     */
+    @Deprecated
     public StatsDMetricsMonitor(String host, int port, String prefix, MetricsFilter metricsFilter) {
         this(host, port, prefix, Naming.defaultNaming(), getDefaultGaugeSendPeriod(), createScheduler(), metricsFilter);
     }
@@ -218,7 +235,6 @@ public boolean isAutoRegisterMetric() {
 
     @Override
     public void close() {
-        scheduler.shutdown();
         client.stop();
     }
 

statsd/src/main/java/com/avast/metrics/statsd/StatsDMetricsMonitorBuilder.java

@@ -0,0 +1,49 @@
+package com.avast.metrics.statsd;
+
+import com.avast.metrics.api.Naming;
+import com.avast.metrics.filter.MetricsFilter;
+
+import java.time.Duration;
+import java.util.concurrent.ScheduledExecutorService;
+
+public class StatsDMetricsMonitorBuilder {
+    private final String host;
+    private final int port;
+    private final String prefix;
+    private final ScheduledExecutorService scheduler;
+    private boolean autoRegisterMetrics = false;
+    private Naming naming = Naming.defaultNaming();
+    private Duration gaugeSendPeriod = Duration.ofSeconds(1);
+    private MetricsFilter metricsFilter = MetricsFilter.ALL_ENABLED;
+
+    public StatsDMetricsMonitorBuilder(String host, int port, String prefix, final ScheduledExecutorService scheduler) {
+        this.host = host;
+        this.port = port;
+        this.prefix = prefix;
+        this.scheduler = scheduler;
+    }
+
+    public StatsDMetricsMonitorBuilder withAutoRegisterMetrics(boolean autoRegisterMetrics) {
+        this.autoRegisterMetrics = autoRegisterMetrics;
+        return this;
+    }
+
+    public StatsDMetricsMonitorBuilder withNaming(Naming naming) {
+        this.naming = naming;
+        return this;
+    }
+
+    public StatsDMetricsMonitorBuilder withGaugeSendPeriod(Duration gaugeSendPeriod) {
+        this.gaugeSendPeriod = gaugeSendPeriod;
+        return this;
+    }
+
+    public StatsDMetricsMonitorBuilder withMetricsFilter(MetricsFilter metricsFilter) {
+        this.metricsFilter = metricsFilter;
+        return this;
+    }
+
+    public StatsDMetricsMonitor build() {
+        return new StatsDMetricsMonitor(host, port, autoRegisterMetrics, prefix, naming, gaugeSendPeriod, scheduler, metricsFilter);
+    }
+}