nullaway

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

Author: zeitlinger

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

@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
+import javax.annotation.Nullable;
 
 /**
  * Info metric. Example:
@@ -144,7 +145,7 @@ public Builder name(String name) {
 
     /** Throws an {@link UnsupportedOperationException} because Info metrics cannot have a unit. */
     @Override
-    public Builder unit(Unit unit) {
+    public Builder unit(@Nullable Unit unit) {
       if (unit != null) {
         throw new UnsupportedOperationException("Info metrics cannot have a unit.");
       }

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

@@ -69,7 +69,7 @@ public B name(String name) {
       return self();
     }
 
-    public B unit(Unit unit) {
+    public B unit(@Nullable Unit unit) {
       this.unit = unit;
       return self();
     }

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

@@ -1,7 +1,5 @@
 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.
@@ -75,7 +73,7 @@ public T sum(double sum) {
       return self();
     }
 
-    public T exemplars(@Nullable Exemplars exemplars) {
+    public T exemplars(Exemplars exemplars) {
       this.exemplars = exemplars;
       return self();
     }

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

@@ -3,7 +3,6 @@
 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 {
@@ -399,7 +398,7 @@ protected Builder self() {
         return this;
       }
 
-      public Builder classicHistogramBuckets(@Nullable ClassicHistogramBuckets classicBuckets) {
+      public Builder classicHistogramBuckets(ClassicHistogramBuckets classicBuckets) {
         this.classicHistogramBuckets = classicBuckets;
         return this;
       }
@@ -420,13 +419,13 @@ public Builder nativeZeroThreshold(double zeroThreshold) {
       }
 
       public Builder nativeBucketsForPositiveValues(
-          @Nullable NativeHistogramBuckets bucketsForPositiveValues) {
+          NativeHistogramBuckets bucketsForPositiveValues) {
         this.nativeBucketsForPositiveValues = bucketsForPositiveValues;
         return this;
       }
 
       public Builder nativeBucketsForNegativeValues(
-          @Nullable NativeHistogramBuckets bucketsForNegativeValues) {
+          NativeHistogramBuckets bucketsForNegativeValues) {
         this.nativeBucketsForNegativeValues = bucketsForNegativeValues;
         return this;
       }

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

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import javax.annotation.Nullable;
 
 /** Immutable snapshot of an Info metric. */
 public final class InfoSnapshot extends MetricSnapshot {
@@ -85,7 +86,7 @@ public Builder dataPoint(InfoDataPointSnapshot dataPoint) {
     }
 
     @Override
-    public Builder unit(Unit unit) {
+    public Builder unit(@Nullable Unit unit) {
       throw new IllegalArgumentException("Info metric cannot have a unit.");
     }
 

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

@@ -7,6 +7,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Stream;
+import javax.annotation.Nullable;
 
 /** Immutable snapshot of a StateSet metric. */
 public final class StateSetSnapshot extends MetricSnapshot {
@@ -212,7 +213,7 @@ public Builder dataPoint(StateSetDataPointSnapshot dataPoint) {
     }
 
     @Override
-    public Builder unit(Unit unit) {
+    public Builder unit(@Nullable Unit unit) {
       throw new IllegalArgumentException("StateSet metric cannot have a unit.");
     }
 

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

@@ -3,7 +3,6 @@
 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 {
@@ -103,7 +102,7 @@ protected Builder self() {
         return this;
       }
 
-      public Builder quantiles(@Nullable Quantiles quantiles) {
+      public Builder quantiles(Quantiles quantiles) {
         this.quantiles = quantiles;
         return this;
       }

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

@@ -118,7 +118,9 @@ private MetricSnapshot convertCounter(Collector.MetricFamilySamples samples) {
       if (sample.name.endsWith("_created")) {
         dataPoint.createdTimestampMillis((long) Unit.secondsToMillis(sample.value));
       } else {
-        dataPoint.value(sample.value).exemplar(convertExemplar(sample.exemplar));
+        if (sample.exemplar != null) {
+          dataPoint.value(sample.value).exemplar(convertExemplar(sample.exemplar));
+        }
         if (sample.timestampMs != null) {
           dataPoint.scrapeTimestampMillis(sample.timestampMs);
         }
@@ -140,8 +142,10 @@ private MetricSnapshot convertGauge(Collector.MetricFamilySamples samples) {
       GaugeSnapshot.GaugeDataPointSnapshot.Builder dataPoint =
           GaugeSnapshot.GaugeDataPointSnapshot.builder()
               .value(sample.value)
-              .labels(Labels.of(sample.labelNames, sample.labelValues))
-              .exemplar(convertExemplar(sample.exemplar));
+              .labels(Labels.of(sample.labelNames, sample.labelValues));
+      if (sample.exemplar != null) {
+        dataPoint.exemplar(convertExemplar(sample.exemplar));
+      }
       if (sample.timestampMs != null) {
         dataPoint.scrapeTimestampMillis(sample.timestampMs);
       }
@@ -281,8 +285,10 @@ private MetricSnapshot convertUnknown(Collector.MetricFamilySamples samples) {
       UnknownSnapshot.UnknownDataPointSnapshot.Builder dataPoint =
           UnknownSnapshot.UnknownDataPointSnapshot.builder()
               .value(sample.value)
-              .labels(Labels.of(sample.labelNames, sample.labelValues))
-              .exemplar(convertExemplar(sample.exemplar));
+              .labels(Labels.of(sample.labelNames, sample.labelValues));
+      if (sample.exemplar != null) {
+        dataPoint.exemplar(convertExemplar(sample.exemplar));
+      }
       if (sample.timestampMs != null) {
         dataPoint.scrapeTimestampMillis(sample.timestampMs);
       }
@@ -358,11 +364,7 @@ private MetricSnapshot convertInfo(Collector.MetricFamilySamples samples) {
     return info.build();
   }
 
-  @Nullable
-  private Exemplar convertExemplar(@Nullable io.prometheus.client.exemplars.Exemplar exemplar) {
-    if (exemplar == null) {
-      return null;
-    }
+  private Exemplar convertExemplar(io.prometheus.client.exemplars.Exemplar exemplar) {
     Exemplar.Builder result = Exemplar.builder().value(exemplar.getValue());
     if (exemplar.getTimestampMs() != null) {
       result.timestampMillis(exemplar.getTimestampMs());