Check for null config before adding

smallrye · Sep 7, 2023 · a6140ff · a6140ff
1 parent 941453b
commit a6140ff
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/...ation/src/main/java/io/smallrye/metrics/setup/config/HistogramBucketMaxConfiguration.java b/...ation/src/main/java/io/smallrye/metrics/setup/config/HistogramBucketMaxConfiguration.java
@@ -53,7 +53,10 @@ public static Collection<HistogramBucketMaxConfiguration> parse(String input) {
             }
 
             // LIFO - right most configuration takes precedence
-            metricBucketMinMax.addFirst(metricBucketConfiguration);
+            if (metricBucketConfiguration != null) {
+                metricBucketMinMax.addFirst(metricBucketConfiguration);
+            }
+
         }
         return metricBucketMinMax;
 

diff --git a/...ation/src/main/java/io/smallrye/metrics/setup/config/HistogramBucketMinConfiguration.java b/...ation/src/main/java/io/smallrye/metrics/setup/config/HistogramBucketMinConfiguration.java
@@ -53,7 +53,10 @@ public static Collection<HistogramBucketMinConfiguration> parse(String input) {
             }
 
             // LIFO - right most configuration takes precedence
-            metricBucketMinMax.addFirst(metricBucketConfiguration);
+            if (metricBucketConfiguration != null) {
+                metricBucketMinMax.addFirst(metricBucketConfiguration);
+            }
+
         }
         return metricBucketMinMax;
 

diff --git a/...mentation/src/main/java/io/smallrye/metrics/setup/config/TimerBucketMaxConfiguration.java b/...mentation/src/main/java/io/smallrye/metrics/setup/config/TimerBucketMaxConfiguration.java
@@ -69,10 +69,13 @@ public static Collection<TimerBucketMaxConfiguration> parse(String input) {
                 continue;
             }
 
-            sloMinConfiguration = new TimerBucketMaxConfiguration(metricName, dur);
+            if (dur != null) {
+                sloMinConfiguration = new TimerBucketMaxConfiguration(metricName, dur);
+
+                // LIFO - right most configuration takes precedence
+                sloMinConfigCollection.addFirst(sloMinConfiguration);
+            }
 
-            // LIFO - right most configuration takes precedence
-            sloMinConfigCollection.addFirst(sloMinConfiguration);
         }
         return sloMinConfigCollection;
 

diff --git a/...mentation/src/main/java/io/smallrye/metrics/setup/config/TimerBucketMinConfiguration.java b/...mentation/src/main/java/io/smallrye/metrics/setup/config/TimerBucketMinConfiguration.java
@@ -69,10 +69,13 @@ public static Collection<TimerBucketMinConfiguration> parse(String input) {
                 continue;
             }
 
-            sloMinConfiguration = new TimerBucketMinConfiguration(metricName, dur);
+            if (dur != null) {
+                sloMinConfiguration = new TimerBucketMinConfiguration(metricName, dur);
+
+                // LIFO - right most configuration takes precedence
+                sloMinConfigCollection.addFirst(sloMinConfiguration);
+            }
 
-            // LIFO - right most configuration takes precedence
-            sloMinConfigCollection.addFirst(sloMinConfiguration);
         }
         return sloMinConfigCollection;