From 739f95d6fd0dce8ff95344e6463ba6c0b3ce572c Mon Sep 17 00:00:00 2001 From: Eugene Schava Date: Fri, 17 Nov 2017 11:14:02 +0200 Subject: [PATCH] fixed issue with failed InfluxDB insertion if custom prefix is empty --- .../influxdb/generators/AbstractPointGenerator.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/jenkinsci/plugins/influxdb/generators/AbstractPointGenerator.java b/src/main/java/jenkinsci/plugins/influxdb/generators/AbstractPointGenerator.java index 3ed1bc9e..e69ef676 100644 --- a/src/main/java/jenkinsci/plugins/influxdb/generators/AbstractPointGenerator.java +++ b/src/main/java/jenkinsci/plugins/influxdb/generators/AbstractPointGenerator.java @@ -21,12 +21,17 @@ public AbstractPointGenerator(MeasurementRenderer projectNameRenderer) { @Override public Point.Builder buildPoint(String name, String customPrefix, Run build) { final String renderedProjectName = projectNameRenderer.render(build); - return Point + Point.Builder builder = Point .measurement(name) .addField(PROJECT_NAME, renderedProjectName) .addField(BUILD_NUMBER, build.getNumber()) - .tag(PROJECT_NAME, renderedProjectName) - .tag(CUSTOM_PREFIX, measurementName(customPrefix)); + .tag(PROJECT_NAME, renderedProjectName); + + if (customPrefix != null && !customPrefix.isEmpty()) + builder = builder.tag(CUSTOM_PREFIX, measurementName(customPrefix)); + + return builder; + } protected String measurementName(String measurement) {