Merge pull request #718 from jenkinsci/bugfix/deadlock-in-nbBuildsGauge

Avoiding potential deadlock in counting number of builds
jenkinsci · Dec 6, 2024 · 98e119d · 98e119d
2 parents a72036c + 6196875
commit 98e119d
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/prometheus/collectors/jobs/NbBuildsGauge.java b/src/main/java/org/jenkinsci/plugins/prometheus/collectors/jobs/NbBuildsGauge.java
@@ -5,10 +5,12 @@
 import io.prometheus.client.SimpleCollector;
 import org.jenkinsci.plugins.prometheus.collectors.CollectorType;
 import org.jenkinsci.plugins.prometheus.collectors.builds.BuildsMetricCollector;
-
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 public class NbBuildsGauge extends BuildsMetricCollector<Job<?, ?>, Gauge> {
 
+    private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+
     protected NbBuildsGauge(String[] labelNames, String namespace, String subsystem) {
         super(labelNames, namespace, subsystem);
     }
@@ -30,7 +32,12 @@ protected SimpleCollector.Builder<?, Gauge> getCollectorBuilder() {
 
     @Override
     public void calculateMetric(Job<?, ?> jenkinsObject, String[] labelValues) {
-        int nbBuilds = jenkinsObject.getBuildsAsMap().size();
-        this.collector.labels(labelValues).set(nbBuilds);
+        lock.readLock().lock();
+        try  {
+            int nbBuilds = jenkinsObject.getBuildsAsMap().size();
+            this.collector.labels(labelValues).set(nbBuilds);
+        } finally {
+            lock.readLock().unlock();
+        }
     }
 }