Fixing duplicate entry when using "Collect metrics for each run" for …

…running_build_duration_milliseconds (#513)
jenkinsci · Apr 11, 2023 · 00c6fc1 · 00c6fc1
1 parent 6a9c81d
commit 00c6fc1
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/prometheus/JobCollector.java b/src/main/java/org/jenkinsci/plugins/prometheus/JobCollector.java
@@ -45,7 +45,7 @@ public class JobCollector extends Collector {
     private NbBuildsGauge nbBuildsGauge;
 
     private BuildDiscardGauge buildDiscardGauge;
-
+    private CurrentRunDurationGauge currentRunDurationGauge;
 
     private static class BuildMetrics {
 
@@ -58,8 +58,6 @@ private static class BuildMetrics {
         public Gauge jobBuildTestsSkipped;
         public Gauge jobBuildTestsFailing;
 
-        public CurrentRunDurationGauge currentRunDurationGauge;
-
         private String buildPrefix;
 
         public BuildMetrics(String buildPrefix) {
@@ -122,7 +120,7 @@ public void initCollectors(String fullname, String subsystem, String namespace,
                     .help("Summary of Jenkins build times by Job and Stage in the last build")
                     .create();
 
-            this.currentRunDurationGauge = new CurrentRunDurationGauge(labelNameArray, namespace, subsystem);
+
         }
     }
 
@@ -207,6 +205,8 @@ public List<MetricFamilySamples> collect() {
 
         buildDiscardGauge = new BuildDiscardGauge(labelBaseNameArray, namespace, subsystem);
 
+        currentRunDurationGauge = new CurrentRunDurationGauge(labelBaseNameArray, namespace, subsystem);
+
         if (PrometheusConfiguration.get().isPerBuildMetrics()) {
             labelNameArray = Arrays.copyOf(labelNameArray, labelNameArray.length + 1);
             labelNameArray[labelNameArray.length - 1] = "number";
@@ -241,7 +241,7 @@ public List<MetricFamilySamples> collect() {
         addSamples(samples, jobHealthScoreGauge.collect(), "Adding [{}] samples from gauge ({})");
         addSamples(samples, nbBuildsGauge.collect(), "Adding [{}] samples from gauge ({})");
         addSamples(samples, buildDiscardGauge.collect(), "Adding [{}] samples from gauge ({})");
-
+        addSamples(samples, currentRunDurationGauge.collect(), "Adding [{}] samples from gauge ({})");
         addSamples(samples, lastBuildMetrics);
         if (PrometheusConfiguration.get().isPerBuildMetrics()) {
             addSamples(samples, perBuildMetrics);
@@ -264,7 +264,6 @@ private void addSamples(List<MetricFamilySamples> allSamples, BuildMetrics build
         addSamples(allSamples, buildMetrics.jobBuildResultOrdinal.collect(), "Adding [{}] samples from gauge ({})");
         addSamples(allSamples, buildMetrics.jobBuildResult.collect(), "Adding [{}] samples from gauge ({})");
         addSamples(allSamples, buildMetrics.jobBuildDuration.collect(), "Adding [{}] samples from gauge ({})");
-        addSamples(allSamples, buildMetrics.currentRunDurationGauge.collect(), "Adding [{}] samples from gauge ({})");
         addSamples(allSamples, buildMetrics.jobBuildStartMillis.collect(), "Adding [{}] samples from gauge ({})");
         addSamples(allSamples, buildMetrics.jobBuildTestsTotal.collect(), "Adding [{}] samples from gauge ({})");
         addSamples(allSamples, buildMetrics.jobBuildTestsSkipped.collect(), "Adding [{}] samples from gauge ({})");
@@ -295,7 +294,7 @@ protected void appendJobMetrics(Job job) {
         nbBuildsGauge.calculateMetric(job, baseLabelValueArray);
         jobHealthScoreGauge.calculateMetric(job, baseLabelValueArray);
         buildDiscardGauge.calculateMetric(job, baseLabelValueArray);
-
+        currentRunDurationGauge.calculateMetric(job, baseLabelValueArray);
         processRun(job, lastBuild, baseLabelValueArray, lastBuildMetrics);
 
         Run run = lastBuild;
@@ -381,7 +380,7 @@ private void processRun(Job job, Run run, String[] buildLabelValueArray, BuildMe
 
         buildMetrics.jobBuildStartMillis.labels(buildLabelValueArray).set(millis);
 
-        buildMetrics.currentRunDurationGauge.calculateMetric(job, buildLabelValueArray);
+
         if (!run.isBuilding()) {
             buildMetrics.jobBuildDuration.labels(buildLabelValueArray).set(duration);
             processRunTestsResults(run, buildLabelValueArray, buildMetrics);