nullaway

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

Author: zeitlinger

prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/DistributionDataPointSnapshot.java

@@ -1,5 +1,7 @@
 package io.prometheus.metrics.model.snapshots;
 
+import javax.annotation.Nullable;
+
 /**
  * Common base class for histogram and summary data. Histograms and Summaries represent
  * distributions, like a latency distribution or a distribution of request sizes in Bytes.
@@ -73,7 +75,7 @@ public T sum(double sum) {
       return self();
     }
 
-    public T exemplars(Exemplars exemplars) {
+    public T exemplars(@Nullable Exemplars exemplars) {
       this.exemplars = exemplars;
       return self();
     }

prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/HistogramSnapshot.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import javax.annotation.Nullable;
 
 /** Immutable snapshot of a Histogram. */
 public final class HistogramSnapshot extends MetricSnapshot {
@@ -398,7 +399,7 @@ protected Builder self() {
         return this;
       }
 
-      public Builder classicHistogramBuckets(ClassicHistogramBuckets classicBuckets) {
+      public Builder classicHistogramBuckets(@Nullable ClassicHistogramBuckets classicBuckets) {
         this.classicHistogramBuckets = classicBuckets;
         return this;
       }
@@ -419,13 +420,13 @@ public Builder nativeZeroThreshold(double zeroThreshold) {
       }
 
       public Builder nativeBucketsForPositiveValues(
-          NativeHistogramBuckets bucketsForPositiveValues) {
+          @Nullable NativeHistogramBuckets bucketsForPositiveValues) {
         this.nativeBucketsForPositiveValues = bucketsForPositiveValues;
         return this;
       }
 
       public Builder nativeBucketsForNegativeValues(
-          NativeHistogramBuckets bucketsForNegativeValues) {
+          @Nullable NativeHistogramBuckets bucketsForNegativeValues) {
         this.nativeBucketsForNegativeValues = bucketsForNegativeValues;
         return this;
       }

prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricSnapshot.java

@@ -63,12 +63,12 @@ public T name(String name) {
       return self();
     }
 
-    public T help(String help) {
+    public T help(@Nullable String help) {
       this.help = help;
       return self();
     }
 
-    public T unit(Unit unit) {
+    public T unit(@Nullable Unit unit) {
       this.unit = unit;
       return self();
     }

prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/SummarySnapshot.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import javax.annotation.Nullable;
 
 /** Immutable snapshot of a Summary metric. */
 public final class SummarySnapshot extends MetricSnapshot {
@@ -102,7 +103,7 @@ protected Builder self() {
         return this;
       }
 
-      public Builder quantiles(Quantiles quantiles) {
+      public Builder quantiles(@Nullable Quantiles quantiles) {
         this.quantiles = quantiles;
         return this;
       }

prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/UnknownSnapshot.java

@@ -82,7 +82,7 @@ public Builder value(double value) {
       }
 
       /** Optional */
-      public Builder exemplar(Exemplar exemplar) {
+      public Builder exemplar(@Nullable Exemplar exemplar) {
         this.exemplar = exemplar;
         return this;
       }

prometheus-metrics-simpleclient-bridge/src/main/java/io/prometheus/metrics/simpleclient/bridge/SimpleclientCollector.java

@@ -1,6 +1,7 @@
 package io.prometheus.metrics.simpleclient.bridge;
 
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.sanitizeMetricName;
+import static java.util.Objects.requireNonNull;
 
 import io.prometheus.client.Collector;
 import io.prometheus.client.CollectorRegistry;
@@ -29,6 +30,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.Nullable;
 
 /**
  * Bridge from {@code simpleclient} (version 0.16.0 and older) to the new {@code prometheus-metrics}
@@ -183,10 +185,9 @@ private MetricSnapshot convertHistogram(
     }
     for (Labels labels : dataPoints.keySet()) {
       histogram.dataPoint(
-          dataPoints
-              .get(labels)
-              .classicHistogramBuckets(makeBuckets(cumulativeBuckets.get(labels)))
-              .exemplars(exemplars.get(labels).build())
+          requireNonNull(dataPoints.get(labels))
+              .classicHistogramBuckets(makeBuckets(requireNonNull(cumulativeBuckets.get(labels))))
+              .exemplars(requireNonNull(exemplars.get(labels)).build())
               .build());
     }
     return histogram.build();
@@ -233,10 +234,9 @@ private MetricSnapshot convertSummary(Collector.MetricFamilySamples samples) {
     }
     for (Labels labels : dataPoints.keySet()) {
       summary.dataPoint(
-          dataPoints
-              .get(labels)
-              .quantiles(quantiles.get(labels).build())
-              .exemplars(exemplars.get(labels).build())
+          requireNonNull(dataPoints.get(labels))
+              .quantiles(requireNonNull(quantiles.get(labels)).build())
+              .exemplars(requireNonNull(exemplars.get(labels)).build())
               .build());
     }
     return summary.build();
@@ -291,6 +291,7 @@ private MetricSnapshot convertUnknown(Collector.MetricFamilySamples samples) {
     return unknown.build();
   }
 
+  @Nullable
   private Unit convertUnit(Collector.MetricFamilySamples samples) {
     if (samples.unit != null && !samples.unit.isEmpty()) {
       return new Unit(samples.unit);
@@ -306,7 +307,7 @@ private ClassicHistogramBuckets makeBuckets(Map<Double, Long> cumulativeBuckets)
     ClassicHistogramBuckets.Builder result = ClassicHistogramBuckets.builder();
     long previousCount = 0L;
     for (Double upperBound : upperBounds) {
-      long cumulativeCount = cumulativeBuckets.get(upperBound);
+      long cumulativeCount = requireNonNull(cumulativeBuckets.get(upperBound));
       result.bucket(upperBound, cumulativeCount - previousCount);
       previousCount = cumulativeCount;
     }
@@ -357,7 +358,8 @@ private MetricSnapshot convertInfo(Collector.MetricFamilySamples samples) {
     return info.build();
   }
 
-  private Exemplar convertExemplar(io.prometheus.client.exemplars.Exemplar exemplar) {
+  @Nullable
+  private Exemplar convertExemplar(@Nullable io.prometheus.client.exemplars.Exemplar exemplar) {
     if (exemplar == null) {
       return null;
     }
@@ -388,7 +390,7 @@ public static Builder builder() {
 
   public static class Builder {
 
-    private CollectorRegistry collectorRegistry;
+    @Nullable private CollectorRegistry collectorRegistry;
 
     private Builder() {}