Skip to content

Commit 1e4a945

Browse files
renovate[bot]zeitlinger
renovate[bot]
and
zeitlinger
authored
chore(deps): update dependency com.diffplug.spotless:spotless-maven-plugin to v3 (#1593)
Coming soon: The Renovate bot (GitHub App) will be renamed to Mend. PRs from Renovate will soon appear from 'Mend'. Learn more [here](https://redirect.github.com/renovatebot/renovate/discussions/37842). This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [com.diffplug.spotless:spotless-maven-plugin](https://redirect.github.com/diffplug/spotless) | `2.46.1` -> `3.0.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.diffplug.spotless:spotless-maven-plugin/3.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.diffplug.spotless:spotless-maven-plugin/2.46.1/3.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>diffplug/spotless (com.diffplug.spotless:spotless-maven-plugin)</summary> ### [`v3.0.0`](https://redirect.github.com/diffplug/spotless/blob/HEAD/CHANGES.md#300---2025-01-06) #### \[3.0.0] - 2025-01-06 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/prometheus/client_java). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS45Ny4xMCIsInVwZGF0ZWRJblZlciI6IjQxLjk3LjEwIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=--> --------- Signed-off-by: Gregor Zeitlinger <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Gregor Zeitlinger <[email protected]>
1 parent 42b0703 commit 1e4a945

File tree

12 files changed

+32
-32
lines changed

12 files changed

+32
-32
lines changed

‎integration-tests/it-spring-boot-smoke-test/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<plugin>
148148
<groupId>com.diffplug.spotless</groupId>
149149
<artifactId>spotless-maven-plugin</artifactId>
150-
<version>2.46.1</version>
150+
<version>3.0.0</version>
151151
<configuration>
152152
<java>
153153
<googleJavaFormat/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ public void cacheExposesMetricsForHitMissAndEviction(Options options) {
7575
if (options.collectEvictionWeightAsCounter) {
7676
assertCounterMetric(registry, "caffeine_cache_eviction_weight", "users", 2.0);
7777
openMetricEvictionWeightExpectedText =
78-
"""
78+
"""
7979
# TYPE caffeine_cache_eviction_weight counter
8080
# HELP caffeine_cache_eviction_weight Weight of evicted cache entries, doesn't include manually removed entries
8181
caffeine_cache_eviction_weight_total{cache="users"} 2.0
8282
""";
8383
} else {
8484
assertGaugeMetric(registry, "caffeine_cache_eviction_weight", "users", 2.0);
8585
openMetricEvictionWeightExpectedText =
86-
"""
86+
"""
8787
# TYPE caffeine_cache_eviction_weight gauge
8888
# HELP caffeine_cache_eviction_weight Weight of evicted cache entries, doesn't include manually removed entries
8989
caffeine_cache_eviction_weight{cache="users"} 2.0
@@ -153,15 +153,15 @@ public void weightedCacheExposesMetricsForHitMissAndEvictionWeightedSize(Options
153153
if (options.collectEvictionWeightAsCounter) {
154154
assertCounterMetric(registry, "caffeine_cache_eviction_weight", "users", 31.0);
155155
openMetricEvictionWeightExpectedText =
156-
"""
156+
"""
157157
# TYPE caffeine_cache_eviction_weight counter
158158
# HELP caffeine_cache_eviction_weight Weight of evicted cache entries, doesn't include manually removed entries
159159
caffeine_cache_eviction_weight_total{cache="users"} 31.0
160160
""";
161161
} else {
162162
assertGaugeMetric(registry, "caffeine_cache_eviction_weight", "users", 31.0);
163163
openMetricEvictionWeightExpectedText =
164-
"""
164+
"""
165165
# TYPE caffeine_cache_eviction_weight gauge
166166
# HELP caffeine_cache_eviction_weight Weight of evicted cache entries, doesn't include manually removed entries
167167
caffeine_cache_eviction_weight{cache="users"} 31.0

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void testBuilderCreatesOkay() {
4949
public void testCounter() {
5050
metricRegistry.counter("foo.bar").inc(1);
5151
String expected =
52-
"""
52+
"""
5353
# TYPE foo_bar counter
5454
# HELP foo_bar Generated from Dropwizard metric import (metric=foo.bar, type=com.codahale.metrics.Counter)
5555
foo_bar_total 1.0
@@ -105,7 +105,7 @@ public Boolean getValue() {
105105
metricRegistry.register("boolean.gauge", booleanGauge);
106106

107107
String expected =
108-
"""
108+
"""
109109
# TYPE boolean_gauge gauge
110110
# HELP boolean_gauge Generated from Dropwizard metric import (metric=boolean.gauge, type=io.prometheus.metrics.instrumentation.dropwizard.DropwizardExportsTest$5)
111111
boolean_gauge 1.0
@@ -161,7 +161,7 @@ public void testHistogram() {
161161

162162
// The result should look like this
163163
String expected1 =
164-
"""
164+
"""
165165
# TYPE hist summary
166166
# HELP hist Generated from Dropwizard metric import (metric=hist, type=com.codahale.metrics.Histogram)
167167
hist{quantile="0.5"} 49.0
@@ -177,7 +177,7 @@ public void testHistogram() {
177177
// However, Dropwizard uses a random reservoir sampling algorithm, so the values could as well
178178
// be off-by-one
179179
String expected2 =
180-
"""
180+
"""
181181
# TYPE hist summary
182182
# HELP hist Generated from Dropwizard metric import (metric=hist, type=com.codahale.metrics.Histogram)
183183
hist{quantile="0.5"} 50.0
@@ -205,7 +205,7 @@ public void testMeter() {
205205
meter.mark();
206206

207207
String expected =
208-
"""
208+
"""
209209
# TYPE meter counter
210210
# HELP meter Generated from Dropwizard metric import (metric=meter_total, type=com.codahale.metrics.Meter)
211211
meter_total 2.0
@@ -247,7 +247,7 @@ public void testThatMetricHelpUsesOriginalDropwizardName() {
247247
metricRegistry.register("my.application.namedGauge1", new ExampleDoubleGauge());
248248

249249
String expected =
250-
"""
250+
"""
251251
# TYPE my_application_namedCounter1 counter
252252
# HELP my_application_namedCounter1 Generated from Dropwizard metric import (metric=my.application.namedCounter1, type=com.codahale.metrics.Counter)
253253
my_application_namedCounter1_total 0.0
@@ -286,7 +286,7 @@ void responseWhenRegistryIsEmpty() {
286286
registry.register(DropwizardExports.builder().dropwizardRegistry(metricRegistry).build());
287287
assertThat(convertToOpenMetricsFormat(registry))
288288
.isEqualTo(
289-
"""
289+
"""
290290
# EOF
291291
""");
292292
}
@@ -320,7 +320,7 @@ void collectInvalidMetricPassesWhenExceptionIsIgnored() {
320320
.register(registry);
321321
assertThat(convertToOpenMetricsFormat(registry))
322322
.isEqualTo(
323-
"""
323+
"""
324324
# TYPE my_application_namedCounter2 counter
325325
# HELP my_application_namedCounter2 Generated from Dropwizard metric import (metric=my.application.namedCounter2, type=com.codahale.metrics.Counter)
326326
my_application_namedCounter2_total 10.0

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void setUp() {
3333
public void testCounter() {
3434
metricRegistry.counter("foo.bar").inc(1);
3535
String expected =
36-
"""
36+
"""
3737
# TYPE foo_bar counter
3838
# HELP foo_bar Generated from Dropwizard metric import (metric=foo.bar, type=io.dropwizard.metrics5.Counter)
3939
foo_bar_total 1.0
@@ -89,7 +89,7 @@ public Boolean getValue() {
8989
metricRegistry.register(MetricName.parse("boolean.gauge"), booleanGauge);
9090

9191
String expected =
92-
"""
92+
"""
9393
# TYPE boolean_gauge gauge
9494
# HELP boolean_gauge Generated from Dropwizard metric import (metric=boolean.gauge, type=io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExportsTest$5)
9595
boolean_gauge 1.0
@@ -210,7 +210,7 @@ public void testMeter() {
210210
meter.mark();
211211

212212
String expected =
213-
"""
213+
"""
214214
# TYPE meter counter
215215
# HELP meter Generated from Dropwizard metric import (metric=meter_total, type=io.dropwizard.metrics5.Meter)
216216
meter_total 2.0
@@ -256,7 +256,7 @@ public void testThatMetricHelpUsesOriginalDropwizardName() {
256256
MetricName.parse("my.application.namedGauge1"), new ExampleDoubleGauge());
257257

258258
String expected =
259-
"""
259+
"""
260260
# TYPE my_application_namedCounter1 counter
261261
# HELP my_application_namedCounter1 Generated from Dropwizard metric import (metric=my.application.namedCounter1, type=io.dropwizard.metrics5.Counter)
262262
my_application_namedCounter1_total 0.0
@@ -295,7 +295,7 @@ void responseWhenRegistryIsEmpty() {
295295
registry.register(DropwizardExports.builder().dropwizardRegistry(metricRegistry).build());
296296
assertThat(convertToOpenMetricsFormat(registry))
297297
.isEqualTo(
298-
"""
298+
"""
299299
# EOF
300300
""");
301301
}
@@ -329,7 +329,7 @@ void collectInvalidMetricPassesWhenExceptionIsIgnored() {
329329
.register(registry);
330330
assertThat(convertToOpenMetricsFormat(registry))
331331
.isEqualTo(
332-
"""
332+
"""
333333
# TYPE my_application_namedCounter2 counter
334334
# HELP my_application_namedCounter2 Generated from Dropwizard metric import (metric=my.application.namedCounter2, type=io.dropwizard.metrics5.Counter)
335335
my_application_namedCounter2_total 10.0

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void test_WHEN_NoMatches_THEN_ShouldReturnDefaultSample() {
4545
System.out.println(convertToOpenMetricsFormat(dropwizardExports.collect()));
4646

4747
String expected =
48-
"""
48+
"""
4949
# TYPE app_okhttpclient_client_HttpClient_service counter
5050
# HELP app_okhttpclient_client_HttpClient_service Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.service.total, type=io.dropwizard.metrics5.Counter)
5151
app_okhttpclient_client_HttpClient_service_total 1.0
@@ -76,7 +76,7 @@ public void test_WHEN_OneMatch_THEN_ShouldReturnConverted() {
7676
metricRegistry.counter("app.okhttpclient.client.HttpClient.greatService.total").inc(1);
7777

7878
String expected =
79-
"""
79+
"""
8080
# TYPE app_okhttpclient_client_HttpClient counter
8181
# HELP app_okhttpclient_client_HttpClient Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.total, type=io.dropwizard.metrics5.Counter)
8282
app_okhttpclient_client_HttpClient_total{service="greatService"} 1.0
@@ -107,7 +107,7 @@ public void test_WHEN_MoreMatches_THEN_ShouldReturnFirstOne() {
107107
metricRegistry.counter("app.okhttpclient.client.HttpClient.greatService.total").inc(1);
108108

109109
String expected =
110-
"""
110+
"""
111111
# TYPE app_okhttpclient_client_HttpClient counter
112112
# HELP app_okhttpclient_client_HttpClient Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.total, type=io.dropwizard.metrics5.Counter)
113113
app_okhttpclient_client_HttpClient_total{service="greatService"} 1.0
@@ -144,7 +144,7 @@ public void test_WHEN_MoreMatchesReverseOrder_THEN_ShouldReturnFirstOne() {
144144
metricRegistry.counter("app.okhttpclient.client.HttpClient.greatService.400").inc(1);
145145

146146
String expected =
147-
"""
147+
"""
148148
# TYPE app_okhttpclient_client_HttpClient counter
149149
# HELP app_okhttpclient_client_HttpClient Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.400, type=io.dropwizard.metrics5.Counter)
150150
app_okhttpclient_client_HttpClient_total{service="greatService",status="400"} 1.0
@@ -177,7 +177,7 @@ public void test_WHEN_MoreToFormatInLabelsAndName_THEN_ShouldReturnCorrectSample
177177
System.out.println(convertToOpenMetricsFormat(dropwizardExports.collect()));
178178

179179
String expected =
180-
"""
180+
"""
181181
# TYPE app_okhttpclient_client_HttpClient_greatService counter
182182
# HELP app_okhttpclient_client_HttpClient_greatService Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.400, type=io.dropwizard.metrics5.Counter)
183183
app_okhttpclient_client_HttpClient_greatService_total{service="greatService_400",status="s_400"} 1.0
@@ -206,7 +206,7 @@ public void test_WHEN_AdditionalLabels_THEN_ShouldReturnCorrectSample() {
206206
metricRegistry.counter("app.okhttpclient.client.HttpClient.greatService.400").inc(1);
207207

208208
String expected =
209-
"""
209+
"""
210210
# TYPE app_okhttpclient_client_HttpClient_greatService counter
211211
# HELP app_okhttpclient_client_HttpClient_greatService Generated from Dropwizard metric import (metric=app.okhttpclient.client.HttpClient.greatService.400, type=io.dropwizard.metrics5.Counter)
212212
app_okhttpclient_client_HttpClient_greatService_total{client="sampleClient",service="greatService",status="s_400"} 1.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void testGoodCase() throws IOException {
3333
MetricSnapshots snapshots = registry.scrape();
3434

3535
String expected =
36-
"""
36+
"""
3737
# TYPE jvm_classes_currently_loaded gauge
3838
# HELP jvm_classes_currently_loaded The number of classes that are currently loaded in the JVM
3939
jvm_classes_currently_loaded 1000.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void testGoodCase() throws IOException {
3232
MetricSnapshots snapshots = registry.scrape();
3333

3434
String expected =
35-
"""
35+
"""
3636
# TYPE jvm_compilation_time_seconds counter
3737
# UNIT jvm_compilation_time_seconds seconds
3838
# HELP jvm_compilation_time_seconds The total time in seconds taken for HotSpot class compilation

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void testGoodCase() throws IOException {
8888
MetricSnapshots snapshots = registry.scrape();
8989

9090
String expected =
91-
"""
91+
"""
9292
# TYPE jvm_memory_committed_bytes gauge
9393
# UNIT jvm_memory_committed_bytes bytes
9494
# HELP jvm_memory_committed_bytes Committed (bytes) of a given JVM memory area.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public void testNativeMemoryTrackingEnabled() throws IOException {
182182
MetricSnapshots snapshots = registry.scrape();
183183

184184
String expected =
185-
"""
185+
"""
186186
# TYPE jvm_native_memory_committed_bytes gauge
187187
# UNIT jvm_native_memory_committed_bytes bytes
188188
# HELP jvm_native_memory_committed_bytes Committed bytes of a given JVM. Committed memory represents the amount of memory the JVM is using right now.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void testGoodCase() throws IOException {
2121
MetricSnapshots snapshots = registry.scrape();
2222

2323
String expected =
24-
"""
24+
"""
2525
# TYPE jvm_runtime info
2626
# HELP jvm_runtime JVM runtime info
2727
jvm_runtime_info{runtime="OpenJDK Runtime Environment",vendor="Oracle Corporation",version="1.8.0_382-b05"} 1

0 commit comments

Comments
 (0)