nullaway

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

Author: zeitlinger

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

@@ -119,7 +119,7 @@ static class DataPoint implements CounterDataPoint {
     private final long createdTimeMillis = System.currentTimeMillis();
 
     @Nullable
-    private final ExemplarSampler exemplarSampler; // null if isExemplarsEnabled() is false
+    private final ExemplarSampler exemplarSampler; // null if exemplarSamplerConfig is null
 
     private DataPoint(@Nullable ExemplarSampler exemplarSampler) {
       this.exemplarSampler = exemplarSampler;

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

@@ -2,6 +2,8 @@
 
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
+
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -31,10 +33,10 @@ public interface Callback {
 
   private CounterWithCallback(Builder builder) {
     super(builder);
-    this.callback = builder.callback;
-    if (callback == null) {
+    if (builder.callback == null) {
       throw new IllegalArgumentException("callback cannot be null");
     }
+    this.callback = builder.callback;
   }
 
   @Override
@@ -60,6 +62,7 @@ public static Builder builder(PrometheusProperties properties) {
   public static class Builder
       extends CallbackMetric.Builder<CounterWithCallback.Builder, CounterWithCallback> {
 
+    @Nullable
     private Consumer<Callback> callback;
 
     public Builder callback(Consumer<Callback> callback) {

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

@@ -107,7 +107,7 @@ protected DataPoint newDataPoint() {
   static class DataPoint implements GaugeDataPoint {
 
     @Nullable
-    private final ExemplarSampler exemplarSampler; // null if isExemplarsEnabled() is false
+    private final ExemplarSampler exemplarSampler; // null if exemplarSamplerConfig is null
 
     private DataPoint(@Nullable ExemplarSampler exemplarSampler) {
       this.exemplarSampler = exemplarSampler;

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

@@ -2,6 +2,8 @@
 
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
+
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -36,10 +38,10 @@ public interface Callback {
 
   private GaugeWithCallback(Builder builder) {
     super(builder);
-    this.callback = builder.callback;
-    if (callback == null) {
+    if (builder.callback == null) {
       throw new IllegalArgumentException("callback cannot be null");
     }
+    this.callback = builder.callback;
   }
 
   @Override
@@ -64,6 +66,7 @@ public static Builder builder(PrometheusProperties properties) {
   public static class Builder
       extends CallbackMetric.Builder<GaugeWithCallback.Builder, GaugeWithCallback> {
 
+    @Nullable
     private Consumer<Callback> callback;
 
     public Builder callback(Consumer<Callback> callback) {

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

@@ -197,7 +197,7 @@ public class DataPoint implements DistributionDataPoint {
     private volatile long createdTimeMillis = System.currentTimeMillis();
     private final Buffer buffer = new Buffer();
     private volatile boolean resetDurationExpired = false;
-    private final ExemplarSampler exemplarSampler;
+    @Nullable private final ExemplarSampler exemplarSampler;
 
     private DataPoint() {
       if (exemplarSamplerConfig != null) {
@@ -221,7 +221,7 @@ public void observe(double value) {
       if (!buffer.append(value)) {
         doObserve(value, false);
       }
-      if (exemplarSamplerConfig != null) {
+      if (exemplarSampler != null) {
         exemplarSampler.observe(value);
       }
     }
@@ -235,7 +235,7 @@ public void observeWithExemplar(double value, Labels labels) {
       if (!buffer.append(value)) {
         doObserve(value, false);
       }
-      if (exemplarSamplerConfig != null) {
+      if (exemplarSampler != null) {
         exemplarSampler.observeWithExemplar(value, labels);
       }
     }
@@ -676,14 +676,14 @@ public static class Builder extends StatefulMetric.Builder<Histogram.Builder, Hi
     private static final int DEFAULT_NATIVE_MAX_NUMBER_OF_BUCKETS = 160;
     private static final long DEFAULT_NATIVE_RESET_DURATION_SECONDS = 0; // 0 means no reset
 
-    private Boolean nativeOnly;
-    private Boolean classicOnly;
-    private double[] classicUpperBounds;
-    private Integer nativeInitialSchema;
-    private Double nativeMaxZeroThreshold;
-    private Double nativeMinZeroThreshold;
-    private Integer nativeMaxNumberOfBuckets;
-    private Long nativeResetDurationSeconds;
+    @Nullable private Boolean nativeOnly;
+    @Nullable private Boolean classicOnly;
+    @Nullable private double[] classicUpperBounds;
+    @Nullable private Integer nativeInitialSchema;
+    @Nullable private Double nativeMaxZeroThreshold;
+    @Nullable private Double nativeMinZeroThreshold;
+    @Nullable private Integer nativeMaxNumberOfBuckets;
+    @Nullable private Long nativeResetDurationSeconds;
 
     @Override
     public Histogram build() {

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

@@ -1,17 +1,18 @@
 package io.prometheus.metrics.core.metrics;
 
-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;
 import io.prometheus.metrics.model.snapshots.StateSetSnapshot;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
 
+import static io.prometheus.metrics.model.snapshots.PrometheusNaming.prometheusName;
+
 /**
  * StateSet metric. Example:
  *
@@ -102,11 +103,6 @@ protected DataPoint newDataPoint() {
     return new DataPoint();
   }
 
-  @Override
-  protected boolean isExemplarsEnabled() {
-    return exemplarsEnabled;
-  }
-
   class DataPoint implements StateSetDataPoint {
 
     private final boolean[] values = new boolean[names.length];

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

@@ -5,6 +5,8 @@
 import io.prometheus.metrics.core.datapoints.DataPoint;
 import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -36,7 +38,7 @@ public abstract class StatefulMetric<D extends DataPoint, T extends D>
   private final ConcurrentHashMap<List<String>, T> data = new ConcurrentHashMap<>();
 
   /** Shortcut for data.get(Collections.emptyList()) */
-  private volatile T noLabels;
+  @Nullable private volatile T noLabels;
 
   protected StatefulMetric(Builder<?, ?> builder) {
     super(builder);
@@ -193,12 +195,10 @@ protected <P> P getConfigProperty(
         "Missing default config. This is a bug in the Prometheus metrics core library.");
   }
 
-  protected abstract boolean isExemplarsEnabled();
-
   abstract static class Builder<B extends Builder<B, M>, M extends StatefulMetric<?, ?>>
       extends MetricWithFixedMetadata.Builder<B, M> {
 
-    protected Boolean exemplarsEnabled;
+    @Nullable protected Boolean exemplarsEnabled;
 
     protected Builder(List<String> illegalLabelNames, PrometheusProperties config) {
       super(illegalLabelNames, config);

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

@@ -118,7 +118,7 @@ public class DataPoint implements DistributionDataPoint {
     private final DoubleAdder sum = new DoubleAdder();
     private final SlidingWindow<CKMSQuantiles> quantileValues;
     private final Buffer buffer = new Buffer();
-    private final ExemplarSampler exemplarSampler;
+    @Nullable private final ExemplarSampler exemplarSampler;
 
     private final long createdTimeMillis = System.currentTimeMillis();
 
@@ -150,7 +150,7 @@ public void observe(double value) {
       if (!buffer.append(value)) {
         doObserve(value);
       }
-      if (exemplarSamplerConfig != null) {
+      if (exemplarSampler != null) {
         exemplarSampler.observe(value);
       }
     }
@@ -163,7 +163,7 @@ public void observeWithExemplar(double value, Labels labels) {
       if (!buffer.append(value)) {
         doObserve(value);
       }
-      if (exemplarSamplerConfig != null) {
+      if (exemplarSampler != null) {
         exemplarSampler.observeWithExemplar(value, labels);
       }
     }

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

@@ -4,6 +4,8 @@
 import io.prometheus.metrics.model.snapshots.Exemplars;
 import io.prometheus.metrics.model.snapshots.Quantiles;
 import io.prometheus.metrics.model.snapshots.SummarySnapshot;
+
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -44,10 +46,10 @@ public interface Callback {
 
   private SummaryWithCallback(Builder builder) {
     super(builder);
-    this.callback = builder.callback;
-    if (callback == null) {
+    if (builder.callback == null) {
       throw new IllegalArgumentException("callback cannot be null");
     }
+    this.callback = builder.callback;
   }
 
   @Override
@@ -73,6 +75,7 @@ public static Builder builder(PrometheusProperties properties) {
   public static class Builder
       extends CallbackMetric.Builder<SummaryWithCallback.Builder, SummaryWithCallback> {
 
+    @Nullable
     private Consumer<Callback> callback;
 
     public Builder callback(Consumer<Callback> callback) {