wip: merge from master and fix some test

1 files changed, 14 insertions, 3 deletions

diff --git a/kamon-statsd/src/main/resources/reference.conf b/kamon-statsd/src/main/resources/reference.conf
index 4840fb11..9ea2832a 100644
--- a/kamon-statsd/src/main/resources/reference.conf
+++ b/kamon-statsd/src/main/resources/reference.conf
@@ -14,9 +14,6 @@ kamon {
     # kamon.metric.tick-interval setting.
     flush-interval = 10 seconds
 
-    # Max packet size for UDP metrics data sent to StatsD.
-    max-packet-size = 1024 bytes
-
     # Subscription patterns used to select which metrics will be pushed to StatsD. Note that first, metrics
     # collection for your desired entities must be activated under the kamon.metrics.filters settings.
     subscriptions {
@@ -63,6 +60,20 @@ kamon {
       #     version of StatsD or if you are running your own, customized version of StatsD that supports this.
       metric-name-normalization-strategy = normalize
     }
+
+    # FQCN of the implementation of `kamon.statsd.StatsDMetricsSenderFactory` to be instantiated and use for
+    # creating StatsD sender. Provided implementations are:
+    #   -  `kamon.statsd.BatchStatsDMetricsSender`. Sends a UDP packet every "kamon.statsd.flush-interval" or
+    #       as long as "kamon.statsd.batch-metric-sender.max-packet-size" is reached. Default one.
+    #   -  `kamon.statsd.SimpleStatsDMetricsSender`. Sends a UDP packet for each piece of data it receives.
+    metric-sender-factory = kamon.statsd.BatchStatsDMetricsSender
+
+    # Settings for `kamon.statsd.BatchStatsDMetricsSender`.
+    # Used only if kamon.statsd.metric-sender-factory is set to `kamon.statsd.BatchStatsDMetricsSender`
+    batch-metric-sender {
+      # Max packet size for UDP metrics data sent to StatsD.
+      max-packet-size = 1024 bytes
+    }
   }
 
   modules {