Skip to content

Commit 8c8ad09

Browse files
zeitlingerzeitlinger
committed
fix errorprone
Signed-off-by: Gregor Zeitlinger <[email protected]>
1 parent 8f515e9 commit 8c8ad09

File tree

13 files changed

+448
-399
lines changed

13 files changed

+448
-399
lines changed

‎prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/DefaultHandler.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ public class DefaultHandler implements HttpHandler {
1313

1414
public DefaultHandler() {
1515
String responseString =
16-
""
17-
+ "<html>\n"
16+
"<html>\n"
1817
+ "<head><title>Prometheus Java Client</title></head>\n"
1918
+ "<body>\n"
2019
+ "<h1>Prometheus Java Client</h1>\n"

‎prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExportsTest.java‎

Lines changed: 60 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ public void setUp() {
3131
public void testCounter() {
3232
metricRegistry.counter("foo.bar").inc(1);
3333
String expected =
34-
"# TYPE foo_bar counter\n"
35-
+ "# HELP foo_bar Generated from Dropwizard metric import (metric=foo.bar, type=io.dropwizard.metrics5.Counter)\n"
36-
+ "foo_bar_total 1.0\n"
37-
+ "# EOF\n";
34+
"""
35+
# TYPE foo_bar counter
36+
# HELP foo_bar Generated from Dropwizard metric import (metric=foo.bar, type=io.dropwizard.metrics5.Counter)
37+
foo_bar_total 1.0
38+
# EOF
39+
""";
3840

3941
assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
4042
}
@@ -85,22 +87,24 @@ public Boolean getValue() {
8587
metricRegistry.register("boolean.gauge", booleanGauge);
8688

8789
String expected =
88-
"# TYPE boolean_gauge gauge\n"
89-
+ "# HELP boolean_gauge Generated from Dropwizard metric import (metric=boolean.gauge, type=io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExportsTest$5)\n"
90-
+ "boolean_gauge 1.0\n"
91-
+ "# TYPE double_gauge gauge\n"
92-
+ "# HELP double_gauge Generated from Dropwizard metric import (metric=double.gauge, type=io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExportsTest$2)\n"
93-
+ "double_gauge 1.234\n"
94-
+ "# TYPE float_gauge gauge\n"
95-
+ "# HELP float_gauge Generated from Dropwizard metric import (metric=float.gauge, type=io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExportsTest$4)\n"
96-
+ "float_gauge 0.1234000027179718\n"
97-
+ "# TYPE integer_gauge gauge\n"
98-
+ "# HELP integer_gauge Generated from Dropwizard metric import (metric=integer.gauge, type=io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExportsTest$1)\n"
99-
+ "integer_gauge 1234.0\n"
100-
+ "# TYPE long_gauge gauge\n"
101-
+ "# HELP long_gauge Generated from Dropwizard metric import (metric=long.gauge, type=io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExportsTest$3)\n"
102-
+ "long_gauge 1234.0\n"
103-
+ "# EOF\n";
90+
"""
91+
# TYPE boolean_gauge gauge
92+
# HELP boolean_gauge Generated from Dropwizard metric import (metric=boolean.gauge, type=io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExportsTest$5)
93+
boolean_gauge 1.0
94+
# TYPE double_gauge gauge
95+
# HELP double_gauge Generated from Dropwizard metric import (metric=double.gauge, type=io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExportsTest$2)
96+
double_gauge 1.234
97+
# TYPE float_gauge gauge
98+
# HELP float_gauge Generated from Dropwizard metric import (metric=float.gauge, type=io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExportsTest$4)
99+
float_gauge 0.1234000027179718
100+
# TYPE integer_gauge gauge
101+
# HELP integer_gauge Generated from Dropwizard metric import (metric=integer.gauge, type=io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExportsTest$1)
102+
integer_gauge 1234.0
103+
# TYPE long_gauge gauge
104+
# HELP long_gauge Generated from Dropwizard metric import (metric=long.gauge, type=io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExportsTest$3)
105+
long_gauge 1234.0
106+
# EOF
107+
""";
104108

105109
assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
106110
}
@@ -203,10 +207,12 @@ public void testMeter() {
203207
meter.mark();
204208

205209
String expected =
206-
"# TYPE meter counter\n"
207-
+ "# HELP meter Generated from Dropwizard metric import (metric=meter_total, type=io.dropwizard.metrics5.Meter)\n"
208-
+ "meter_total 2.0\n"
209-
+ "# EOF\n";
210+
"""
211+
# TYPE meter counter
212+
# HELP meter Generated from Dropwizard metric import (metric=meter_total, type=io.dropwizard.metrics5.Meter)
213+
meter_total 2.0
214+
# EOF
215+
""";
210216
assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
211217
}
212218

@@ -246,34 +252,36 @@ public void testThatMetricHelpUsesOriginalDropwizardName() {
246252
metricRegistry.register("my.application.namedGauge1", new ExampleDoubleGauge());
247253

248254
String expected =
249-
"# TYPE my_application_namedCounter1 counter\n"
250-
+ "# HELP my_application_namedCounter1 Generated from Dropwizard metric import (metric=my.application.namedCounter1, type=io.dropwizard.metrics5.Counter)\n"
251-
+ "my_application_namedCounter1_total 0.0\n"
252-
+ "# TYPE my_application_namedGauge1 gauge\n"
253-
+ "# HELP my_application_namedGauge1 Generated from Dropwizard metric import (metric=my.application.namedGauge1, type=io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExportsTest$ExampleDoubleGauge)\n"
254-
+ "my_application_namedGauge1 0.0\n"
255-
+ "# TYPE my_application_namedHistogram1 summary\n"
256-
+ "# HELP my_application_namedHistogram1 Generated from Dropwizard metric import (metric=my.application.namedHistogram1, type=io.dropwizard.metrics5.Histogram)\n"
257-
+ "my_application_namedHistogram1{quantile=\"0.5\"} 0.0\n"
258-
+ "my_application_namedHistogram1{quantile=\"0.75\"} 0.0\n"
259-
+ "my_application_namedHistogram1{quantile=\"0.95\"} 0.0\n"
260-
+ "my_application_namedHistogram1{quantile=\"0.98\"} 0.0\n"
261-
+ "my_application_namedHistogram1{quantile=\"0.99\"} 0.0\n"
262-
+ "my_application_namedHistogram1{quantile=\"0.999\"} 0.0\n"
263-
+ "my_application_namedHistogram1_count 0\n"
264-
+ "# TYPE my_application_namedMeter1 counter\n"
265-
+ "# HELP my_application_namedMeter1 Generated from Dropwizard metric import (metric=my.application.namedMeter1_total, type=io.dropwizard.metrics5.Meter)\n"
266-
+ "my_application_namedMeter1_total 0.0\n"
267-
+ "# TYPE my_application_namedTimer1 summary\n"
268-
+ "# HELP my_application_namedTimer1 Generated from Dropwizard metric import (metric=my.application.namedTimer1, type=io.dropwizard.metrics5.Timer)\n"
269-
+ "my_application_namedTimer1{quantile=\"0.5\"} 0.0\n"
270-
+ "my_application_namedTimer1{quantile=\"0.75\"} 0.0\n"
271-
+ "my_application_namedTimer1{quantile=\"0.95\"} 0.0\n"
272-
+ "my_application_namedTimer1{quantile=\"0.98\"} 0.0\n"
273-
+ "my_application_namedTimer1{quantile=\"0.99\"} 0.0\n"
274-
+ "my_application_namedTimer1{quantile=\"0.999\"} 0.0\n"
275-
+ "my_application_namedTimer1_count 0\n"
276-
+ "# EOF\n";
255+
"""
256+
# TYPE my_application_namedCounter1 counter
257+
# HELP my_application_namedCounter1 Generated from Dropwizard metric import (metric=my.application.namedCounter1, type=io.dropwizard.metrics5.Counter)
258+
my_application_namedCounter1_total 0.0
259+
# TYPE my_application_namedGauge1 gauge
260+
# HELP my_application_namedGauge1 Generated from Dropwizard metric import (metric=my.application.namedGauge1, type=io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExportsTest$ExampleDoubleGauge)
261+
my_application_namedGauge1 0.0
262+
# TYPE my_application_namedHistogram1 summary
263+
# HELP my_application_namedHistogram1 Generated from Dropwizard metric import (metric=my.application.namedHistogram1, type=io.dropwizard.metrics5.Histogram)
264+
my_application_namedHistogram1{quantile="0.5"} 0.0
265+
my_application_namedHistogram1{quantile="0.75"} 0.0
266+
my_application_namedHistogram1{quantile="0.95"} 0.0
267+
my_application_namedHistogram1{quantile="0.98"} 0.0
268+
my_application_namedHistogram1{quantile="0.99"} 0.0
269+
my_application_namedHistogram1{quantile="0.999"} 0.0
270+
my_application_namedHistogram1_count 0
271+
# TYPE my_application_namedMeter1 counter
272+
# HELP my_application_namedMeter1 Generated from Dropwizard metric import (metric=my.application.namedMeter1_total, type=io.dropwizard.metrics5.Meter)
273+
my_application_namedMeter1_total 0.0
274+
# TYPE my_application_namedTimer1 summary
275+
# HELP my_application_namedTimer1 Generated from Dropwizard metric import (metric=my.application.namedTimer1, type=io.dropwizard.metrics5.Timer)
276+
my_application_namedTimer1{quantile="0.5"} 0.0
277+
my_application_namedTimer1{quantile="0.75"} 0.0
278+
my_application_namedTimer1{quantile="0.95"} 0.0
279+
my_application_namedTimer1{quantile="0.98"} 0.0
280+
my_application_namedTimer1{quantile="0.99"} 0.0
281+
my_application_namedTimer1{quantile="0.999"} 0.0
282+
my_application_namedTimer1_count 0
283+
# EOF
284+
""";
277285
assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
278286
}
279287

‎prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/CustomLabelMapperTest.java‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,12 @@ public void test_WHEN_NoMatches_THEN_ShouldReturnDefaultSample() {
4444
System.out.println(convertToOpenMetricsFormat(dropwizardExports.collect()));
4545

4646
String expected =
47-
"# TYPE app_okhttpclient_client_HttpClient_service counter\n"
48-
+ "# HELP app_okhttpclient_client_HttpClient_service Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.service.total, type=io.dropwizard.metrics5.Counter)\n"
49-
+ "app_okhttpclient_client_HttpClient_service_total 1.0\n"
50-
+ "# EOF\n";
47+
"""
48+
# TYPE app_okhttpclient_client_HttpClient_service counter
49+
# HELP app_okhttpclient_client_HttpClient_service Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.service.total, type=io.dropwizard.metrics5.Counter)
50+
app_okhttpclient_client_HttpClient_service_total 1.0
51+
# EOF
52+
""";
5153

5254
assertThat(convertToOpenMetricsFormat(dropwizardExports.collect())).isEqualTo(expected);
5355
}
@@ -73,10 +75,12 @@ public void test_WHEN_OneMatch_THEN_ShouldReturnConverted() {
7375
metricRegistry.counter("app.okhttpclient.client.HttpClient.greatService.total").inc(1);
7476

7577
String expected =
76-
"# TYPE app_okhttpclient_client_HttpClient counter\n"
77-
+ "# HELP app_okhttpclient_client_HttpClient Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.total, type=io.dropwizard.metrics5.Counter)\n"
78-
+ "app_okhttpclient_client_HttpClient_total{service=\"greatService\"} 1.0\n"
79-
+ "# EOF\n";
78+
"""
79+
# TYPE app_okhttpclient_client_HttpClient counter
80+
# HELP app_okhttpclient_client_HttpClient Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.total, type=io.dropwizard.metrics5.Counter)
81+
app_okhttpclient_client_HttpClient_total{service="greatService"} 1.0
82+
# EOF
83+
""";
8084
assertThat(convertToOpenMetricsFormat(dropwizardExports.collect())).isEqualTo(expected);
8185
}
8286

@@ -102,10 +106,12 @@ public void test_WHEN_MoreMatches_THEN_ShouldReturnFirstOne() {
102106
metricRegistry.counter("app.okhttpclient.client.HttpClient.greatService.total").inc(1);
103107

104108
String expected =
105-
"# TYPE app_okhttpclient_client_HttpClient counter\n"
106-
+ "# HELP app_okhttpclient_client_HttpClient Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.total, type=io.dropwizard.metrics5.Counter)\n"
107-
+ "app_okhttpclient_client_HttpClient_total{service=\"greatService\"} 1.0\n"
108-
+ "# EOF\n";
109+
"""
110+
# TYPE app_okhttpclient_client_HttpClient counter
111+
# HELP app_okhttpclient_client_HttpClient Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.total, type=io.dropwizard.metrics5.Counter)
112+
app_okhttpclient_client_HttpClient_total{service="greatService"} 1.0
113+
# EOF
114+
""";
109115
assertThat(convertToOpenMetricsFormat(dropwizardExports.collect())).isEqualTo(expected);
110116
}
111117

@@ -137,10 +143,12 @@ public void test_WHEN_MoreMatchesReverseOrder_THEN_ShouldReturnFirstOne() {
137143
metricRegistry.counter("app.okhttpclient.client.HttpClient.greatService.400").inc(1);
138144

139145
String expected =
140-
"# TYPE app_okhttpclient_client_HttpClient counter\n"
141-
+ "# HELP app_okhttpclient_client_HttpClient Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.400, type=io.dropwizard.metrics5.Counter)\n"
142-
+ "app_okhttpclient_client_HttpClient_total{service=\"greatService\",status=\"400\"} 1.0\n"
143-
+ "# EOF\n";
146+
"""
147+
# TYPE app_okhttpclient_client_HttpClient counter
148+
# HELP app_okhttpclient_client_HttpClient Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.400, type=io.dropwizard.metrics5.Counter)
149+
app_okhttpclient_client_HttpClient_total{service="greatService",status="400"} 1.0
150+
# EOF
151+
""";
144152
assertThat(convertToOpenMetricsFormat(dropwizardExports.collect())).isEqualTo(expected);
145153
}
146154

@@ -168,10 +176,12 @@ public void test_WHEN_MoreToFormatInLabelsAndName_THEN_ShouldReturnCorrectSample
168176
System.out.println(convertToOpenMetricsFormat(dropwizardExports.collect()));
169177

170178
String expected =
171-
"# TYPE app_okhttpclient_client_HttpClient_greatService counter\n"
172-
+ "# HELP app_okhttpclient_client_HttpClient_greatService Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.400, type=io.dropwizard.metrics5.Counter)\n"
173-
+ "app_okhttpclient_client_HttpClient_greatService_total{service=\"greatService_400\",status=\"s_400\"} 1.0\n"
174-
+ "# EOF\n";
179+
"""
180+
# TYPE app_okhttpclient_client_HttpClient_greatService counter
181+
# HELP app_okhttpclient_client_HttpClient_greatService Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.400, type=io.dropwizard.metrics5.Counter)
182+
app_okhttpclient_client_HttpClient_greatService_total{service="greatService_400",status="s_400"} 1.0
183+
# EOF
184+
""";
175185
assertThat(convertToOpenMetricsFormat(dropwizardExports.collect())).isEqualTo(expected);
176186
}
177187

@@ -195,10 +205,12 @@ public void test_WHEN_AdditionalLabels_THEN_ShouldReturnCorrectSample() {
195205
metricRegistry.counter("app.okhttpclient.client.HttpClient.greatService.400").inc(1);
196206

197207
String expected =
198-
"# TYPE app_okhttpclient_client_HttpClient_greatService counter\n"
199-
+ "# HELP app_okhttpclient_client_HttpClient_greatService Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.400, type=io.dropwizard.metrics5.Counter)\n"
200-
+ "app_okhttpclient_client_HttpClient_greatService_total{client=\"sampleClient\",service=\"greatService\",status=\"s_400\"} 1.0\n"
201-
+ "# EOF\n";
208+
"""
209+
# TYPE app_okhttpclient_client_HttpClient_greatService counter
210+
# HELP app_okhttpclient_client_HttpClient_greatService Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.400, type=io.dropwizard.metrics5.Counter)
211+
app_okhttpclient_client_HttpClient_greatService_total{client="sampleClient",service="greatService",status="s_400"} 1.0
212+
# EOF
213+
""";
202214
assertThat(convertToOpenMetricsFormat(dropwizardExports.collect())).isEqualTo(expected);
203215
}
204216

‎prometheus-metrics-instrumentation-guava/src/test/java/io/prometheus/metrics/instrumentation/guava/CacheMetricsCollectorTest.java‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,24 @@ public void cacheExposesMetricsForHitMissAndEviction() {
5252
assertCounterMetric(registry, "guava_cache_eviction", "users", 2.0);
5353

5454
final String expected =
55-
"# TYPE guava_cache_eviction counter\n"
56-
+ "# HELP guava_cache_eviction Cache eviction totals, doesn't include manually removed entries\n"
57-
+ "guava_cache_eviction_total{cache=\"users\"} 2.0\n"
58-
+ "# TYPE guava_cache_hit counter\n"
59-
+ "# HELP guava_cache_hit Cache hit totals\n"
60-
+ "guava_cache_hit_total{cache=\"users\"} 1.0\n"
61-
+ "# TYPE guava_cache_miss counter\n"
62-
+ "# HELP guava_cache_miss Cache miss totals\n"
63-
+ "guava_cache_miss_total{cache=\"users\"} 2.0\n"
64-
+ "# TYPE guava_cache_requests counter\n"
65-
+ "# HELP guava_cache_requests Cache request totals\n"
66-
+ "guava_cache_requests_total{cache=\"users\"} 3.0\n"
67-
+ "# TYPE guava_cache_size gauge\n"
68-
+ "# HELP guava_cache_size Cache size\n"
69-
+ "guava_cache_size{cache=\"users\"} 2.0\n"
70-
+ "# EOF\n";
55+
"""
56+
# TYPE guava_cache_eviction counter
57+
# HELP guava_cache_eviction Cache eviction totals, doesn't include manually removed entries
58+
guava_cache_eviction_total{cache="users"} 2.0
59+
# TYPE guava_cache_hit counter
60+
# HELP guava_cache_hit Cache hit totals
61+
guava_cache_hit_total{cache="users"} 1.0
62+
# TYPE guava_cache_miss counter
63+
# HELP guava_cache_miss Cache miss totals
64+
guava_cache_miss_total{cache="users"} 2.0
65+
# TYPE guava_cache_requests counter
66+
# HELP guava_cache_requests Cache request totals
67+
guava_cache_requests_total{cache="users"} 3.0
68+
# TYPE guava_cache_size gauge
69+
# HELP guava_cache_size Cache size
70+
guava_cache_size{cache="users"} 2.0
71+
# EOF
72+
""";
7173

7274
assertThat(convertToOpenMetricsFormat(registry)).isEqualTo(expected);
7375
}

‎prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmBufferPoolMetricsTest.java‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,23 @@ public void testGoodCase() throws IOException {
4242
MetricSnapshots snapshots = registry.scrape();
4343

4444
String expected =
45-
"# TYPE jvm_buffer_pool_capacity_bytes gauge\n"
46-
+ "# UNIT jvm_buffer_pool_capacity_bytes bytes\n"
47-
+ "# HELP jvm_buffer_pool_capacity_bytes Bytes capacity of a given JVM buffer pool.\n"
48-
+ "jvm_buffer_pool_capacity_bytes{pool=\"direct\"} 3456.0\n"
49-
+ "jvm_buffer_pool_capacity_bytes{pool=\"mapped\"} 4567.0\n"
50-
+ "# TYPE jvm_buffer_pool_used_buffers gauge\n"
51-
+ "# HELP jvm_buffer_pool_used_buffers Used buffers of a given JVM buffer pool.\n"
52-
+ "jvm_buffer_pool_used_buffers{pool=\"direct\"} 2.0\n"
53-
+ "jvm_buffer_pool_used_buffers{pool=\"mapped\"} 3.0\n"
54-
+ "# TYPE jvm_buffer_pool_used_bytes gauge\n"
55-
+ "# UNIT jvm_buffer_pool_used_bytes bytes\n"
56-
+ "# HELP jvm_buffer_pool_used_bytes Used bytes of a given JVM buffer pool.\n"
57-
+ "jvm_buffer_pool_used_bytes{pool=\"direct\"} 1234.0\n"
58-
+ "jvm_buffer_pool_used_bytes{pool=\"mapped\"} 2345.0\n"
59-
+ "# EOF\n";
45+
"""
46+
# TYPE jvm_buffer_pool_capacity_bytes gauge
47+
# UNIT jvm_buffer_pool_capacity_bytes bytes
48+
# HELP jvm_buffer_pool_capacity_bytes Bytes capacity of a given JVM buffer pool.
49+
jvm_buffer_pool_capacity_bytes{pool="direct"} 3456.0
50+
jvm_buffer_pool_capacity_bytes{pool="mapped"} 4567.0
51+
# TYPE jvm_buffer_pool_used_buffers gauge
52+
# HELP jvm_buffer_pool_used_buffers Used buffers of a given JVM buffer pool.
53+
jvm_buffer_pool_used_buffers{pool="direct"} 2.0
54+
jvm_buffer_pool_used_buffers{pool="mapped"} 3.0
55+
# TYPE jvm_buffer_pool_used_bytes gauge
56+
# UNIT jvm_buffer_pool_used_bytes bytes
57+
# HELP jvm_buffer_pool_used_bytes Used bytes of a given JVM buffer pool.
58+
jvm_buffer_pool_used_bytes{pool="direct"} 1234.0
59+
jvm_buffer_pool_used_bytes{pool="mapped"} 2345.0
60+
# EOF
61+
""";
6062

6163
assertThat(convertToOpenMetricsFormat(snapshots)).isEqualTo(expected);
6264
}

0 commit comments

Comments
 (0)