Merge pull request #71 from darxriggs/consistent-project-name

Use same project name in tag and field
jenkinsci · Aug 14, 2019 · dacdb0b · dacdb0b
2 parents 8dc4a2a + 354eec0
commit dacdb0b
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/main/java/jenkinsci/plugins/influxdb/generators/AbstractPointGenerator.java b/src/main/java/jenkinsci/plugins/influxdb/generators/AbstractPointGenerator.java
@@ -27,34 +27,32 @@ public AbstractPointGenerator(MeasurementRenderer projectNameRenderer, long time
 
     @Override
     public Point.Builder buildPoint(String name, String customPrefix, Run<?, ?> build, long timestamp) {
-        String renderedProjectName = projectNameRenderer.render(build);
+        String projectName;
 
-        String projectTagName;
         if (this.replaceDashWithUnderscore) {
-            projectTagName = renderedProjectName;
-        } else if (customPrefix != null){
-            projectTagName = customPrefix + "_" + build.getParent().getName();
+            projectName = projectNameRenderer.render(build);
+        } else if (customPrefix != null) {
+            projectName = customPrefix + "_" + build.getParent().getName();
         } else {
-            projectTagName = build.getParent().getName();
+            projectName = build.getParent().getName();
         }
 
         String projectPath = build.getParent().getRelativeNameFrom(Jenkins.getInstance());
 
         Point.Builder builder = Point
                 .measurement(name)
-                .addField(PROJECT_NAME, renderedProjectName)
+                .addField(PROJECT_NAME, projectName)
                 .addField(PROJECT_PATH, projectPath)
                 .addField(BUILD_NUMBER, build.getNumber())
                 .time(timestamp, TimeUnit.NANOSECONDS);
 
         if (customPrefix != null && !customPrefix.isEmpty())
             builder.tag(CUSTOM_PREFIX, this.replaceDashWithUnderscore ? measurementName(customPrefix) : customPrefix);
 
-        builder.tag(PROJECT_NAME, projectTagName);
+        builder.tag(PROJECT_NAME, projectName);
         builder.tag(PROJECT_PATH, projectPath);
 
         return builder;
-
     }
 
     public Point.Builder buildPoint(String name, String customPrefix, Run<?, ?> build) {