nullaway

Signed-off-by: Gregor Zeitlinger <[email protected]>

Author: zeitlinger

prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/MetricsProperties.java

@@ -414,7 +414,7 @@ public Builder histogramClassicOnly(@Nullable Boolean histogramClassicOnly) {
     }
 
     /** See {@link MetricsProperties#getHistogramClassicUpperBounds()} */
-    public Builder histogramClassicUpperBounds(@Nullable double... histogramClassicUpperBounds) {
+    public Builder histogramClassicUpperBounds(double... histogramClassicUpperBounds) {
       this.histogramClassicUpperBounds = Util.toList(histogramClassicUpperBounds);
       return this;
     }

prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Histogram.java

@@ -690,11 +690,14 @@ public Histogram build() {
 
     @Override
     protected MetricsProperties toProperties() {
-      return MetricsProperties.builder()
+      MetricsProperties.Builder builder = MetricsProperties.builder();
+      if (classicUpperBounds != null) {
+        builder.histogramClassicUpperBounds(classicUpperBounds);
+      }
+      return builder
           .exemplarsEnabled(exemplarsEnabled)
           .histogramNativeOnly(nativeOnly)
           .histogramClassicOnly(classicOnly)
-          .histogramClassicUpperBounds(classicUpperBounds)
           .histogramNativeInitialSchema(nativeInitialSchema)
           .histogramNativeMinZeroThreshold(nativeMinZeroThreshold)
           .histogramNativeMaxZeroThreshold(nativeMaxZeroThreshold)

prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StateSet.java

@@ -2,7 +2,6 @@
 
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.prometheusName;
 
-import io.prometheus.metrics.config.MetricsProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.datapoints.StateSetDataPoint;
 import io.prometheus.metrics.model.snapshots.Labels;
@@ -11,6 +10,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
+import javax.annotation.Nullable;
 
 /**
  * StateSet metric. Example:
@@ -53,14 +53,11 @@
 public class StateSet extends StatefulMetric<StateSetDataPoint, StateSet.DataPoint>
     implements StateSetDataPoint {
 
-  private final boolean exemplarsEnabled;
   private final String[] names;
 
-  private StateSet(Builder builder, PrometheusProperties prometheusProperties) {
+  private StateSet(Builder builder, String[] names) {
     super(builder);
-    MetricsProperties[] properties = getMetricProperties(builder, prometheusProperties);
-    exemplarsEnabled = getConfigProperty(properties, MetricsProperties::getExemplarsEnabled);
-    this.names = builder.names; // builder.names is already a validated copy
+    this.names = names;
     for (String name : names) {
       if (this.getMetadata().getPrometheusName().equals(prometheusName(name))) {
         throw new IllegalArgumentException(
@@ -139,7 +136,7 @@ public static Builder builder(PrometheusProperties config) {
 
   public static class Builder extends StatefulMetric.Builder<Builder, StateSet> {
 
-    private String[] names;
+    @Nullable private String[] names;
 
     private Builder(PrometheusProperties config) {
       super(Collections.emptyList(), config);
@@ -165,7 +162,7 @@ public StateSet build() {
       if (names == null) {
         throw new IllegalStateException("State names are required when building a StateSet.");
       }
-      return new StateSet(this, properties);
+      return new StateSet(this, names);
     }
 
     @Override

prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Summary.java

@@ -1,5 +1,7 @@
 package io.prometheus.metrics.core.metrics;
 
+import static java.util.Objects.requireNonNull;
+
 import io.prometheus.metrics.config.MetricsProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.datapoints.DistributionDataPoint;
@@ -43,6 +45,7 @@ public class Summary extends StatefulMetric<DistributionDataPoint, Summary.DataP
     implements DistributionDataPoint {
 
   private final List<CKMSQuantiles.Quantile> quantiles; // May be empty, but cannot be null.
+
   private final long maxAgeSeconds;
   private final int ageBuckets;
   @Nullable private final ExemplarSamplerConfig exemplarSamplerConfig;
@@ -114,14 +117,16 @@ public class DataPoint implements DistributionDataPoint {
 
     private final LongAdder count = new LongAdder();
     private final DoubleAdder sum = new DoubleAdder();
-    private final SlidingWindow<CKMSQuantiles> quantileValues;
+    @Nullable private final SlidingWindow<CKMSQuantiles> quantileValues;
     private final Buffer buffer = new Buffer();
     @Nullable private final ExemplarSampler exemplarSampler;
 
     private final long createdTimeMillis = System.currentTimeMillis();
 
     private DataPoint() {
-      if (quantiles.size() > 0) {
+      if (quantiles.isEmpty()) {
+        quantileValues = null;
+      } else {
         CKMSQuantiles.Quantile[] quantilesArray = quantiles.toArray(new CKMSQuantiles.Quantile[0]);
         quantileValues =
             new SlidingWindow<>(
@@ -130,8 +135,6 @@ private DataPoint() {
                 CKMSQuantiles::insert,
                 maxAgeSeconds,
                 ageBuckets);
-      } else {
-        quantileValues = null;
       }
       if (exemplarSamplerConfig != null) {
         exemplarSampler = new ExemplarSampler(exemplarSamplerConfig);
@@ -200,7 +203,8 @@ private Quantiles makeQuantiles() {
       for (int i = 0; i < getQuantiles().size(); i++) {
         CKMSQuantiles.Quantile quantile = getQuantiles().get(i);
         quantiles[i] =
-            new Quantile(quantile.quantile, quantileValues.current().get(quantile.quantile));
+            new Quantile(
+                quantile.quantile, requireNonNull(quantileValues).current().get(quantile.quantile));
       }
       return Quantiles.of(quantiles);
     }
@@ -223,8 +227,8 @@ public static class Builder extends StatefulMetric.Builder<Summary.Builder, Summ
     public static final int DEFAULT_NUMBER_OF_AGE_BUCKETS = 5;
 
     private final List<CKMSQuantiles.Quantile> quantiles = new ArrayList<>();
-    private Long maxAgeSeconds;
-    private Integer ageBuckets;
+    @Nullable private Long maxAgeSeconds;
+    @Nullable private Integer ageBuckets;
 
     private Builder(PrometheusProperties properties) {
       super(Collections.singletonList("quantile"), properties);
@@ -325,10 +329,15 @@ protected MetricsProperties toProperties() {
           quantileErrors[i] = this.quantiles.get(i).epsilon;
         }
       }
-      return MetricsProperties.builder()
+      MetricsProperties.Builder builder = MetricsProperties.builder();
+      if (quantiles != null) {
+        builder.summaryQuantiles(quantiles);
+      }
+      if (quantileErrors != null) {
+        builder.summaryQuantileErrors(quantileErrors);
+      }
+      return builder
           .exemplarsEnabled(exemplarsEnabled)
-          .summaryQuantiles(quantiles)
-          .summaryQuantileErrors(quantileErrors)
           .summaryNumberOfAgeBuckets(ageBuckets)
           .summaryMaxAgeSeconds(maxAgeSeconds)
           .build();