Skip to content

Commit 2f5bd9c

Browse files
fedetorres93fedetorres93
committed
Formatting
Signed-off-by: Federico Torres <[email protected]>
1 parent 8143f69 commit 2f5bd9c

File tree

23 files changed

+442
-345
lines changed

23 files changed

+442
-345
lines changed

‎benchmarks/src/main/java/io/prometheus/metrics/benchmarks/TextFormatUtilBenchmark.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ public OutputStream openMetricsWriteToByteArray(WriterState writerState) throws
7070
// avoid growing the array
7171
ByteArrayOutputStream byteArrayOutputStream = writerState.byteArrayOutputStream;
7272
byteArrayOutputStream.reset();
73-
OPEN_METRICS_TEXT_FORMAT_WRITER.write(byteArrayOutputStream, SNAPSHOTS, EscapingScheme.NO_ESCAPING);
73+
OPEN_METRICS_TEXT_FORMAT_WRITER.write(
74+
byteArrayOutputStream, SNAPSHOTS, EscapingScheme.NO_ESCAPING);
7475
return byteArrayOutputStream;
7576
}
7677

@@ -86,7 +87,8 @@ public OutputStream prometheusWriteToByteArray(WriterState writerState) throws I
8687
// avoid growing the array
8788
ByteArrayOutputStream byteArrayOutputStream = writerState.byteArrayOutputStream;
8889
byteArrayOutputStream.reset();
89-
PROMETHEUS_TEXT_FORMAT_WRITER.write(byteArrayOutputStream, SNAPSHOTS, EscapingScheme.NO_ESCAPING);
90+
PROMETHEUS_TEXT_FORMAT_WRITER.write(
91+
byteArrayOutputStream, SNAPSHOTS, EscapingScheme.NO_ESCAPING);
9092
return byteArrayOutputStream;
9193
}
9294

‎prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterPushgatewayProperties.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ public class ExporterPushgatewayProperties {
1414
private final String job;
1515
private final String escapingScheme;
1616

17-
private ExporterPushgatewayProperties(String address, String job, String scheme, String escapingScheme) {
17+
private ExporterPushgatewayProperties(
18+
String address, String job, String scheme, String escapingScheme) {
1819
this.address = address;
1920
this.job = job;
2021
this.scheme = scheme;
@@ -43,8 +44,8 @@ public String getScheme() {
4344
}
4445

4546
/**
46-
* Escaping scheme to be used when pushing metric data to the pushgateway.
47-
* Valid values: "no-escaping", "values", "underscores", "dots". Default is "no-escaping".
47+
* Escaping scheme to be used when pushing metric data to the pushgateway. Valid values:
48+
* "no-escaping", "values", "underscores", "dots". Default is "no-escaping".
4849
*/
4950
public String getEscapingScheme() {
5051
return escapingScheme;
@@ -60,7 +61,7 @@ static ExporterPushgatewayProperties load(Map<Object, Object> properties)
6061
String job = Util.loadString(PREFIX + "." + JOB, properties);
6162
String scheme = Util.loadString(PREFIX + "." + SCHEME, properties);
6263
String escapingScheme = Util.loadString(PREFIX + "." + ESCAPING_SCHEME, properties);
63-
64+
6465
if (scheme != null) {
6566
if (!scheme.equals("http") && !scheme.equals("https")) {
6667
throw new PrometheusPropertiesException(
@@ -69,17 +70,19 @@ static ExporterPushgatewayProperties load(Map<Object, Object> properties)
6970
PREFIX, SCHEME, scheme));
7071
}
7172
}
72-
73+
7374
if (escapingScheme != null) {
74-
if (!escapingScheme.equals("no-escaping") && !escapingScheme.equals("values")
75-
&& !escapingScheme.equals("underscores") && !escapingScheme.equals("dots")) {
75+
if (!escapingScheme.equals("no-escaping")
76+
&& !escapingScheme.equals("values")
77+
&& !escapingScheme.equals("underscores")
78+
&& !escapingScheme.equals("dots")) {
7679
throw new PrometheusPropertiesException(
7780
String.format(
7881
"%s.%s: Illegal value. Expecting 'no-escaping', 'values', 'underscores', or 'dots'. Found: %s",
7982
PREFIX, ESCAPING_SCHEME, escapingScheme));
8083
}
8184
}
82-
85+
8386
return new ExporterPushgatewayProperties(address, job, scheme, escapingScheme);
8487
}
8588
}

‎prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/NamingProperties.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ public String getValidationScheme() {
1616
return validationScheme;
1717
}
1818

19-
static NamingProperties load(Map<Object, Object> properties) throws PrometheusPropertiesException {
19+
static NamingProperties load(Map<Object, Object> properties)
20+
throws PrometheusPropertiesException {
2021
String validationScheme = Util.loadString(PREFIX + "." + VALIDATION_SCHEME, properties);
2122
return new NamingProperties(validationScheme);
2223
}
@@ -40,5 +41,4 @@ public NamingProperties build() {
4041
return new NamingProperties(validationScheme);
4142
}
4243
}
43-
44-
}
44+
}

‎prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusScrapeHandler.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.function.Predicate;
2121
import java.util.zip.GZIPOutputStream;
2222

23-
2423
/** Prometheus scrape endpoint. */
2524
public class PrometheusScrapeHandler {
2625

@@ -139,7 +138,8 @@ private MetricSnapshots scrape(PrometheusHttpRequest request) {
139138
}
140139
}
141140

142-
private boolean writeDebugResponse(MetricSnapshots snapshots, EscapingScheme escapingScheme, PrometheusHttpExchange exchange)
141+
private boolean writeDebugResponse(
142+
MetricSnapshots snapshots, EscapingScheme escapingScheme, PrometheusHttpExchange exchange)
143143
throws IOException {
144144
String debugParam = exchange.getRequest().getParameter("debug");
145145
PrometheusHttpResponse response = exchange.getResponse();
@@ -158,7 +158,9 @@ private boolean writeDebugResponse(MetricSnapshots snapshots, EscapingScheme esc
158158
break;
159159
case "prometheus-protobuf":
160160
String debugString =
161-
expositionFormats.getPrometheusProtobufWriter().toDebugString(snapshots, escapingScheme);
161+
expositionFormats
162+
.getPrometheusProtobufWriter()
163+
.toDebugString(snapshots, escapingScheme);
162164
body.write(debugString.getBytes(StandardCharsets.UTF_8));
163165
break;
164166
default:

‎prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/PushGateway.java‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.prometheus.metrics.model.registry.MultiCollector;
1414
import io.prometheus.metrics.model.registry.PrometheusRegistry;
1515
import io.prometheus.metrics.model.snapshots.EscapingScheme;
16-
1716
import java.io.ByteArrayOutputStream;
1817
import java.io.IOException;
1918
import java.io.InputStream;
@@ -442,11 +441,16 @@ private EscapingScheme getEscapingScheme(ExporterPushgatewayProperties propertie
442441
if (properties != null && properties.getEscapingScheme() != null) {
443442
String scheme = properties.getEscapingScheme();
444443
switch (scheme) {
445-
case "no-escaping": return EscapingScheme.NO_ESCAPING;
446-
case "values": return EscapingScheme.VALUE_ENCODING_ESCAPING;
447-
case "underscores": return EscapingScheme.UNDERSCORE_ESCAPING;
448-
case "dots": return EscapingScheme.DOTS_ESCAPING;
449-
default: return EscapingScheme.NO_ESCAPING;
444+
case "no-escaping":
445+
return EscapingScheme.NO_ESCAPING;
446+
case "values":
447+
return EscapingScheme.VALUE_ENCODING_ESCAPING;
448+
case "underscores":
449+
return EscapingScheme.UNDERSCORE_ESCAPING;
450+
case "dots":
451+
return EscapingScheme.DOTS_ESCAPING;
452+
default:
453+
return EscapingScheme.NO_ESCAPING;
450454
}
451455
}
452456
return EscapingScheme.NO_ESCAPING;
@@ -472,11 +476,22 @@ private URL makeUrl(ExporterPushgatewayProperties properties)
472476
if (groupingKey != null) {
473477
for (Map.Entry<String, String> entry : groupingKey.entrySet()) {
474478
if (entry.getValue().isEmpty()) {
475-
url += "/" + escapeName(entry.getKey(), EscapingScheme.VALUE_ENCODING_ESCAPING) + "@base64/=";
479+
url +=
480+
"/"
481+
+ escapeName(entry.getKey(), EscapingScheme.VALUE_ENCODING_ESCAPING)
482+
+ "@base64/=";
476483
} else if (entry.getValue().contains("/")) {
477-
url += "/" + escapeName(entry.getKey(), EscapingScheme.VALUE_ENCODING_ESCAPING) + "@base64/" + base64url(entry.getValue());
484+
url +=
485+
"/"
486+
+ escapeName(entry.getKey(), EscapingScheme.VALUE_ENCODING_ESCAPING)
487+
+ "@base64/"
488+
+ base64url(entry.getValue());
478489
} else {
479-
url += "/" + escapeName(entry.getKey(), EscapingScheme.VALUE_ENCODING_ESCAPING) + "/" + URLEncoder.encode(entry.getValue(), "UTF-8");
490+
url +=
491+
"/"
492+
+ escapeName(entry.getKey(), EscapingScheme.VALUE_ENCODING_ESCAPING)
493+
+ "/"
494+
+ URLEncoder.encode(entry.getValue(), "UTF-8");
480495
}
481496
}
482497
}

0 commit comments

Comments
 (0)