Fixed failing API tests after switching to settings builder

Author: andsel

logstash-core/src/main/java/org/logstash/ackedqueue/ext/JRubyWrappedAckedQueueExt.java

@@ -21,6 +21,7 @@
 package org.logstash.ackedqueue.ext;
 
 import java.io.IOException;
+import java.util.Objects;
 
 import org.jruby.Ruby;
 import org.jruby.RubyBoolean;
@@ -66,6 +67,7 @@ public JRubyWrappedAckedQueueExt initialize(ThreadContext context, IRubyObject s
         Settings javaSettings = JavaUtil.unwrapJavaObject(settings);
         this.queue = JRubyAckedQueueExt.create(javaSettings);
         this.batchMetricMode = javaSettings.batchMetricMode();
+//        Objects.requireNonNull(this.batchMetricMode, "batchMetricMode must be non-null");
         this.queue.open();
 
         return this;

logstash-core/src/main/java/org/logstash/execution/QueueReadClientBase.java

@@ -39,6 +39,7 @@
 import org.logstash.instrument.metrics.counter.LongCounter;
 
 import java.io.IOException;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
@@ -72,7 +73,8 @@ protected QueueReadClientBase(final Ruby runtime, final RubyClass metaClass) {
     protected QueueReadClientBase(final Ruby runtime, final RubyClass metaClass,
                                   final QueueFactoryExt.BatchMetricMode batchMetricMode) {
         super(runtime, metaClass);
-        this.batchMetrics = new QueueReadClientBatchMetrics(batchMetricMode);
+//        Objects.requireNonNull(batchMetricMode, "batchMetricMode must not be null");
+        this.batchMetrics = new QueueReadClientBatchMetrics(batchMetricMode == null ? QueueFactoryExt.BatchMetricMode.DISABLED : batchMetricMode);
     }
 
     @JRubyMethod(name = "inflight_batches")

logstash-core/src/main/java/org/logstash/execution/QueueReadClientBatchMetrics.java

@@ -28,6 +28,7 @@ public QueueReadClientBatchMetrics(QueueFactoryExt.BatchMetricMode batchMetricMo
     }
 
     public void setupMetrics(AbstractNamespacedMetricExt namespacedMetric) {
+        LOG.debug("setupMetrics called with mode: {}", batchMetricMode);
         ThreadContext context = namespacedMetric.getRuntime().getCurrentContext();
         AbstractNamespacedMetricExt batchNamespace = namespacedMetric.namespace(context, BATCH_KEY);
         if (batchMetricMode != QueueFactoryExt.BatchMetricMode.DISABLED) {