Add validation around null tag strings and drop the measurements with a

warning when such tags are present.
Update the reporter docs.
Update dependency versions.

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         classpath group: 'com.bmuschko', name: 'gradle-clover-plugin', version: '2.2.2'
         classpath group: 'com.github.ben-manes', name: 'gradle-versions-plugin', version: '0.20.0'
         classpath group: 'me.champeau.gradle', name: 'jmh-gradle-plugin', version: '0.4.8'
-        classpath group: 'org.owasp', name: 'dependency-check-gradle', version: '5.2.2'
+        classpath group: 'org.owasp', name: 'dependency-check-gradle', version: '5.3.2.1'
         classpath group: 'gradle.plugin.com.github.spotbugs', name: 'spotbugs-gradle-plugin', version: '2.0.0'
         classpath group: 'org.ajoberstar.reckon', name: 'reckon-gradle', version: '0.9.0'
     }

examples/undertow-httphandler/build.gradle

@@ -14,5 +14,5 @@ dependencies {
     compile platform(group: 'org.apache.logging.log4j', name: 'log4j-bom', version: '2.13.3')
     compile group: 'org.apache.logging.log4j', name: 'log4j-core'
     compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl'
-    compile group: 'io.undertow', name: 'undertow-core', version: '2.1.3.Final'
+    compile group: 'io.undertow', name: 'undertow-core', version: '2.2.3.Final'
 }

reporter-influxdb/README.md

@@ -0,0 +1,28 @@
+# InfluxReporter
+
+This reporter will push batches of metrics to an InfluxDB V1x HTTP API server as JSON object. Note that a database name must be included.
+
+Configuration parameters include:
+
+* **baseUri** - *(required)* A hostname including protocol, host and optional port. E.g. `http://localhost:4242`. Note that the host must start with a protocol of either `http://` or `https://`.
+* **endpoint** - *(Default: `/write?db=`)* A string with the endpoint to post results to. Note that the endpoint must start with a forward slash and can be `/?db=`. If this parameter is set then the `database` parameter will be ignored and must be supplied as a query parameter in the endpoint string.
+* **database** - *(required)* A string denoting the InfluxDB database to send measurements to.
+* **bufferSize** - *(Default: `64 * 1024`)* The maximum size of the buffer before it's flushed.
+* **windowSize** - (Default: `1`) How often to report to the API in seconds.
+
+To instantiate and run the reporter execute:
+
+```Java
+InfluxDBReporter.Builder reporter_builder = 
+    InfluxDBReporter.builder()
+          .withBaseUri(URI.create("http://localhost:4242")))
+          .withDatabase("Ultrabrew")
+          .withWindowSize(60);
+
+InfluxDBReporter reporter = reporter_builder.build();
+MetricRegistry metricRegistry = new MetricRegistry();
+metric_registry.addReporter(reporter);
+
+// on program shutdown
+reporter.close();
+```

reporter-influxdb/build.gradle

@@ -1,4 +1,4 @@
 dependencies {
     compile project(':core')
-    compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6'
+    compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
 }

reporter-influxdb/src/main/java/io/ultrabrew/metrics/reporters/influxdb/InfluxDBClient.java

@@ -4,6 +4,7 @@
 
 package io.ultrabrew.metrics.reporters.influxdb;
 
+import java.util.Arrays;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.BufferOverflowException;
@@ -17,12 +18,15 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class provides methods to access InfluxDB.
  */
 public class InfluxDBClient {
-
+  private static final Logger LOGGER = LoggerFactory.getLogger(InfluxDBClient.class);
+
   private static final String UTF_8 = StandardCharsets.UTF_8.name();
   private static final byte WHITESPACE = ' ';
   private static final byte COMMA = ',';
@@ -57,8 +61,25 @@ private CloseableHttpClient getHttpClient() {
   private void doWrite(final String measurement, final String[] tags, final String[] fields,
       final long timestamp)
       throws IOException {
+    if (measurement == null || measurement.isEmpty()) {
+      LOGGER.warn("Null or empty measurement.");
+      return;
+    }
+    int rollback = byteBuffer.position();
     byteBuffer.put(measurement.getBytes(UTF_8));
     for (int i = 0; i < tags.length; i += 2) {
+      if (tags[i] == null || tags[i].isEmpty()) {
+        LOGGER.warn("Null or empty tag key in tags array: " 
+            + Arrays.toString(tags) + " for measurement " + measurement);
+        byteBuffer.position(rollback);
+        return;
+      }
+      if (tags[i + 1] == null || tags[i + 1].isEmpty()) {
+        LOGGER.warn("Null or empty tag value in tags array: " 
+            + Arrays.toString(tags) + " for measurement " + measurement);
+        byteBuffer.position(rollback);
+        return;
+      }
       byteBuffer.put(COMMA)
           .put(tags[i].getBytes(UTF_8))
           .put(EQUALS)
@@ -71,6 +92,18 @@ private void doWrite(final String measurement, final String[] tags, final String
       if (!f) {
         byteBuffer.put(COMMA);
       }
+      if (fields[i] == null || fields[i].isEmpty()) {
+        LOGGER.warn("Null or empty field name in array: " 
+            + Arrays.toString(fields) + " for measurement " + measurement);
+        byteBuffer.position(rollback);
+        return;
+      }
+      if (fields[i + 1] == null || fields[i + 1].isEmpty()) {
+        LOGGER.warn("Null or empty field value in array: " 
+            + Arrays.toString(fields) + " for measurement " + measurement);
+        byteBuffer.position(rollback);
+        return;
+      }
       byteBuffer.put(fields[i].getBytes(UTF_8))
           .put(EQUALS)
           .put(fields[i + 1].getBytes(UTF_8));

reporter-influxdb/src/main/java/io/ultrabrew/metrics/reporters/influxdb/InfluxDBReporter.java

@@ -82,6 +82,7 @@ private String[] buildFields(CursorEntry cursor) {
   public static class Builder extends TimeWindowReporterBuilder<Builder, InfluxDBReporter> {
 
     private URI baseUri = null;
+    private String endpoint = null;
     private String database = null;
     private int windowSeconds = 1;
     private int bufferSize = 64 * 1024;
@@ -98,6 +99,18 @@ public Builder withBaseUri(final URI baseUri) {
       this.baseUri = baseUri;
       return this;
     }
+
+    /**
+     * An optional endpoint to build the URI that, when provided, overrides the 
+     * default `/write?db=$database`. You must supply the full URI string, e.g.
+     * `/api/put/influx/write?db=mydatabase`. 
+     * @param endpoint An optional non-null endpoint to apply to the base URI.
+     * @return The builder.
+     */
+    public Builder withEndpoint(final String endpoint) {
+      this.endpoint = endpoint;
+      return this;
+    }
 
     /**
      * Set the database name measurements are to be written to.
@@ -137,9 +150,14 @@ public InfluxDBReporter build() {
       if (baseUri == null) {
         throw new IllegalArgumentException("Invalid baseUri");
       }
-      if (database == null || database.isEmpty()) {
+      if ((database == null || database.isEmpty()) && 
+          (endpoint == null || endpoint.isEmpty())) {
         throw new IllegalArgumentException("Invalid database");
       }
+      if (endpoint != null && !endpoint.isEmpty()) {
+        return new InfluxDBReporter(baseUri.resolve(endpoint), windowSeconds,
+            bufferSize, defaultAggregators, metricAggregators);
+      }
       return new InfluxDBReporter(baseUri.resolve("/write?db=" + database), windowSeconds,
           bufferSize, defaultAggregators, metricAggregators);
     }

reporter-opentsdb/README.md

@@ -8,16 +8,23 @@ Configuration parameters include:
 * **endpoint** - *(Default: `/api/put`)* A string with the endpoint to post results to. Note that the endpoint must start with a forward slash and can be `/`.
 * **batchSize** - *(Default: `64`)* The maximum number of measurements to flush in each batch.
 * **timestampsInMilliseconds** - (Default: `false`) Whether or not to post timestamps in seconds `false` or milliseconds `true`.
+* **windowSize** - (Default: `1`) How often to report to the API in seconds.
 
 To instantiate and run the reporter execute:
 
 ```Java
-OpenTSDBConfig config = OpenTSDBConfig.newBuilder()
-  .setHost("http://localhost:4242")
-  .build();
-
-// 60 second reporting window
-OpenTSDBReporter reporter = new OpenTSDBReporter(config, 60);
+OpenTSDBReporter.Builder reporter_builder =
+          OpenTSDBReporter.builder()
+              .withBaseUri(URI.create("http://localhost:4242")))
+              .withBatchSize(64)
+              .withWindowSize(60);
+if (!Strings.isNullOrEmpty(tsdb.getConfig().getString(TSD_ENDPOINT))) {
+  reporter_builder.withApiEndpoint("/proxy/opentsdb/api/put);
+}
+OpenTSDBReporter opentsdb_reporter = reporter_builder.build();
 MetricRegistry metricRegistry = new MetricRegistry();
-metricRegistry.addReporter(reporter);
+metric_registry.addReporter(opentsdb_reporter);
+
+// on program shutdown
+opentsdb_reporter.close();
 ```

reporter-opentsdb/build.gradle

@@ -1,4 +1,4 @@
 dependencies {
     compile project(':core')
-    compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6'
+    compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
 }

reporter-opentsdb/src/main/java/io/ultrabrew/metrics/reporters/opentsdb/OpenTSDBHttpClient.java

@@ -4,6 +4,8 @@
 
 package io.ultrabrew.metrics.reporters.opentsdb;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.Arrays;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -73,10 +75,33 @@ private CloseableHttpClient getHttpClient() {
         .build();
   }
 
+  @SuppressFBWarnings(value="NP", justification="Null check IS performed on tags")
   void write(final String metricName,
       final String[] tags,
       final long timestamp,
       final String value) throws IOException {
+    // validation
+    if (metricName == null || metricName.isEmpty()) {
+      LOG.warn("Null or empty metric name.");
+      return;
+    }
+    if (value == null || value.isEmpty()) {
+      LOG.warn("Null or empty value.");
+      return;
+    }
+    if (tags != null) {
+      if (tags.length % 2 != 0) {
+        LOG.warn("Uneven tag count: " + Arrays.toString(tags) + " for metric " + metricName);
+        return;
+      }
+      for (int i = 0; i < tags.length; i++) {
+        if (tags[i] == null || tags[i].length() < 1) {
+          LOG.warn("Null tag key or value in: " + Arrays.toString(tags) + " for metric " + metricName);
+          return;
+        }
+      }
+    }
+
     if (currentBatchSize++ > 0) {
       writer.write(',');
     }