Skip to content

Commit 0506165

Browse files
committed
nullaway
Signed-off-by: Gregor Zeitlinger <[email protected]>
1 parent d260bf3 commit 0506165

File tree

5 files changed

+38
-9
lines changed

5 files changed

+38
-9
lines changed

prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterPushgatewayPropertiesTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,20 @@ void load() {
3232
private static ExporterPushgatewayProperties load(Map<String, String> map) {
3333
return ExporterPushgatewayProperties.load(new HashMap<>(map));
3434
}
35+
36+
@Test
37+
void builder() {
38+
ExporterPushgatewayProperties properties =
39+
ExporterPushgatewayProperties.builder()
40+
.address("http://localhost")
41+
.job("job")
42+
.scheme("http")
43+
.escapingScheme(EscapingScheme.DOTS_ESCAPING)
44+
.build();
45+
46+
assertThat(properties.getAddress()).isEqualTo("http://localhost");
47+
assertThat(properties.getJob()).isEqualTo("job");
48+
assertThat(properties.getScheme()).isEqualTo("http");
49+
assertThat(properties.getEscapingScheme()).isEqualTo(EscapingScheme.DOTS_ESCAPING);
50+
}
3551
}

prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarSampler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public ExemplarSampler(ExemplarSamplerConfig config) {
5555
* io.prometheus.metrics.tracer.initializer.SpanContextSupplier#getSpanContext()
5656
* SpanContextSupplier.getSpanContext()} is called to find a span context.
5757
*/
58-
public ExemplarSampler(ExemplarSamplerConfig config, SpanContext spanContext) {
58+
public ExemplarSampler(ExemplarSamplerConfig config, @Nullable SpanContext spanContext) {
5959
this.config = config;
6060
this.exemplars = new Exemplar[config.getNumberOfExemplars()];
6161
this.customExemplars = new Exemplar[exemplars.length];

prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/OpenMetricsTextFormatWriter.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,17 +346,21 @@ private void writeCreated(Writer writer, MetricMetadata metadata, DataPointSnaps
346346
}
347347
}
348348

349-
private void writeNameAndLabels(Writer writer, String name, String suffix, Labels labels)
349+
private void writeNameAndLabels(
350+
Writer writer,
351+
String name,
352+
@Nullable String suffix,
353+
Labels labels)
350354
throws IOException {
351355
writeNameAndLabels(writer, name, suffix, labels, null, 0.0);
352356
}
353357

354358
private void writeNameAndLabels(
355359
Writer writer,
356360
String name,
357-
String suffix,
361+
@Nullable String suffix,
358362
Labels labels,
359-
String additionalLabelName,
363+
@Nullable String additionalLabelName,
360364
double additionalLabelValue)
361365
throws IOException {
362366
writer.write(name);

prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/PrometheusTextFormatWriter.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.io.OutputStreamWriter;
2727
import java.io.Writer;
2828
import java.nio.charset.StandardCharsets;
29+
import javax.annotation.Nullable;
2930

3031
/**
3132
* Write the Prometheus text format. This is the default if you view a Prometheus endpoint with your
@@ -344,17 +345,21 @@ private void writeUnknown(Writer writer, UnknownSnapshot snapshot) throws IOExce
344345
}
345346
}
346347

347-
private void writeNameAndLabels(Writer writer, String name, String suffix, Labels labels)
348+
private void writeNameAndLabels(
349+
Writer writer,
350+
String name,
351+
@Nullable String suffix,
352+
Labels labels)
348353
throws IOException {
349354
writeNameAndLabels(writer, name, suffix, labels, null, 0.0);
350355
}
351356

352357
private void writeNameAndLabels(
353358
Writer writer,
354359
String name,
355-
String suffix,
360+
@Nullable String suffix,
356361
Labels labels,
357-
String additionalLabelName,
362+
@Nullable String additionalLabelName,
358363
double additionalLabelValue)
359364
throws IOException {
360365
writer.write(name);
@@ -368,7 +373,8 @@ private void writeNameAndLabels(
368373
}
369374

370375
private void writeMetadata(
371-
Writer writer, String suffix, String typeString, MetricMetadata metadata) throws IOException {
376+
Writer writer,
377+
@Nullable String suffix, String typeString, MetricMetadata metadata) throws IOException {
372378
if (metadata.getHelp() != null && !metadata.getHelp().isEmpty()) {
373379
writer.write("# HELP ");
374380
writer.write(metadata.getPrometheusName());

prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/TextFormatUtil.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.prometheus.metrics.model.snapshots.Labels;
44
import java.io.IOException;
55
import java.io.Writer;
6+
import javax.annotation.Nullable;
67

78
public class TextFormatUtil {
89

@@ -99,7 +100,9 @@ static void writeEscapedLabelValue(Writer writer, String s) throws IOException {
99100
}
100101

101102
static void writeLabels(
102-
Writer writer, Labels labels, String additionalLabelName, double additionalLabelValue)
103+
Writer writer,
104+
Labels labels,
105+
@Nullable String additionalLabelName, double additionalLabelValue)
103106
throws IOException {
104107
writer.write('{');
105108
for (int i = 0; i < labels.size(); i++) {

0 commit comments

Comments
 (0)