Skip to content

Commit a4ff1e5

Browse files
snicollsnicoll
committed
Polish "Add since to deprecations in config metadata JSON files"
See gh-47972 See gh-47980
1 parent 5281f5c commit a4ff1e5

File tree

3 files changed

+40
-52
lines changed

3 files changed

+40
-52
lines changed

‎module/spring-boot-kafka/src/main/resources/META-INF/additional-spring-configuration-metadata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
"name": "spring.kafka.retry.topic.max-delay",
153153
"type": "java.time.Duration",
154154
"deprecation": {
155-
"replacement": "spring.kafka.retry.topic.backoff.maxDelay",
155+
"replacement": "spring.kafka.retry.topic.backoff.max-delay",
156156
"since": "3.4.0"
157157
}
158158
},

‎module/spring-boot-micrometer-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"defaultValue": true,
1515
"deprecation": {
1616
"level": "error",
17-
"replacement": "management.metrics.enable.process.files",
1817
"reason": "Instead, filter 'process.files' metrics.",
1918
"since": "2.1.0"
2019
}
@@ -26,7 +25,6 @@
2625
"defaultValue": true,
2726
"deprecation": {
2827
"level": "error",
29-
"replacement": "management.metrics.enable.jvm",
3028
"reason": "Instead, disable JvmMetricsAutoConfiguration or filter 'jvm' metrics.",
3129
"since": "2.1.0"
3230
}
@@ -38,7 +36,6 @@
3836
"defaultValue": true,
3937
"deprecation": {
4038
"level": "error",
41-
"replacement": "management.metrics.enable.logback",
4239
"reason": "Instead, disable LogbackMetricsAutoConfiguration or filter 'logback' metrics.",
4340
"since": "2.1.0"
4441
}
@@ -409,7 +406,7 @@
409406
"type": "java.lang.String",
410407
"deprecation": {
411408
"level": "error",
412-
"replacement": "management.dynatrace.metrics.export.device-id",
409+
"replacement": "management.dynatrace.metrics.export.v1.device-id",
413410
"since": "3.0.0"
414411
}
415412
},
@@ -427,7 +424,7 @@
427424
"type": "java.lang.String",
428425
"deprecation": {
429426
"level": "error",
430-
"replacement": "management.dynatrace.metrics.export.group",
427+
"replacement": "management.dynatrace.metrics.export.v1.group",
431428
"since": "3.0.0"
432429
}
433430
},
@@ -462,7 +459,7 @@
462459
"type": "java.lang.String",
463460
"deprecation": {
464461
"level": "error",
465-
"replacement": "management.dynatrace.metrics.export.technology-type",
462+
"replacement": "management.dynatrace.metrics.export.v1.technology-type",
466463
"since": "3.0.0"
467464
}
468465
},
@@ -1336,7 +1333,7 @@
13361333
"type": "io.micrometer.prometheus.HistogramFlavor",
13371334
"deprecation": {
13381335
"level": "error",
1339-
"replacement": "management.prometheus.metrics.export.histogram-flavor",
1336+
"reason": "No longer supported by the Prometheus client.",
13401337
"since": "3.0.0"
13411338
}
13421339
},
@@ -1345,7 +1342,7 @@
13451342
"type": "java.lang.String",
13461343
"deprecation": {
13471344
"level": "error",
1348-
"replacement": "management.prometheus.metrics.export.pushgateway.base-url",
1345+
"replacement": "management.prometheus.metrics.export.pushgateway.address",
13491346
"since": "3.0.0"
13501347
}
13511348
},
@@ -1426,7 +1423,7 @@
14261423
"type": "java.lang.String",
14271424
"deprecation": {
14281425
"level": "error",
1429-
"replacement": "management.signalfx.metrics.export.access-token",
1426+
"reason": "SignalFX is no longer supported.",
14301427
"since": "3.0.0"
14311428
}
14321429
},
@@ -1435,7 +1432,7 @@
14351432
"type": "java.lang.Integer",
14361433
"deprecation": {
14371434
"level": "error",
1438-
"replacement": "management.signalfx.metrics.export.batch-size",
1435+
"reason": "SignalFX is no longer supported.",
14391436
"since": "3.0.0"
14401437
}
14411438
},
@@ -1444,7 +1441,7 @@
14441441
"type": "java.time.Duration",
14451442
"deprecation": {
14461443
"level": "error",
1447-
"replacement": "management.signalfx.metrics.export.connect-timeout",
1444+
"reason": "SignalFX is no longer supported.",
14481445
"since": "3.0.0"
14491446
}
14501447
},
@@ -1453,7 +1450,7 @@
14531450
"type": "java.lang.Boolean",
14541451
"deprecation": {
14551452
"level": "error",
1456-
"replacement": "management.signalfx.metrics.export.enabled",
1453+
"reason": "SignalFX is no longer supported.",
14571454
"since": "3.0.0"
14581455
}
14591456
},
@@ -1462,14 +1459,15 @@
14621459
"type": "java.lang.Integer",
14631460
"deprecation": {
14641461
"level": "error",
1462+
"reason": "SignalFX is no longer supported.",
14651463
"since": "3.0.0"
14661464
}
14671465
},
14681466
{
14691467
"name": "management.metrics.export.signalfx.published-histogram-type",
14701468
"deprecation": {
14711469
"level": "error",
1472-
"replacement": "management.signalfx.metrics.export.published-histogram-type",
1470+
"reason": "SignalFX is no longer supported.",
14731471
"since": "3.0.0"
14741472
}
14751473
},
@@ -1478,7 +1476,7 @@
14781476
"type": "java.time.Duration",
14791477
"deprecation": {
14801478
"level": "error",
1481-
"replacement": "management.signalfx.metrics.export.read-timeout",
1479+
"reason": "SignalFX is no longer supported.",
14821480
"since": "3.0.0"
14831481
}
14841482
},
@@ -1487,7 +1485,7 @@
14871485
"type": "java.lang.String",
14881486
"deprecation": {
14891487
"level": "error",
1490-
"replacement": "management.signalfx.metrics.export.source",
1488+
"reason": "SignalFX is no longer supported.",
14911489
"since": "3.0.0"
14921490
}
14931491
},
@@ -1496,7 +1494,7 @@
14961494
"type": "java.time.Duration",
14971495
"deprecation": {
14981496
"level": "error",
1499-
"replacement": "management.signalfx.metrics.export.step",
1497+
"reason": "SignalFX is no longer supported.",
15001498
"since": "3.0.0"
15011499
}
15021500
},
@@ -1505,7 +1503,7 @@
15051503
"type": "java.lang.String",
15061504
"deprecation": {
15071505
"level": "error",
1508-
"replacement": "management.signalfx.metrics.export.uri",
1506+
"reason": "SignalFX is no longer supported.",
15091507
"since": "3.0.0"
15101508
}
15111509
},

‎module/spring-boot-opentelemetry/src/main/resources/META-INF/additional-spring-configuration-metadata.json‎

Lines changed: 24 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,19 @@
44
{
55
"name": "management.logging.export.otlp.enabled",
66
"type": "java.lang.Boolean",
7-
"defaultValue": true,
7+
"defaultValue": true,
88
"description": "Whether auto-configuration of logging is enabled to export logs over OTLP."
9-
},
10-
{
11-
"name": "management.otlp.logging",
12-
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
13-
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
14-
"deprecation": {
15-
"level": "error",
16-
"replacement": "management.opentelemetry.logging.export.otlp",
17-
"since": "4.0.0"
18-
}
199
},
20-
{
10+
{
2111
"name": "management.otlp.logging.compression",
2212
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties$Compression",
2313
"description": "Method used to compress the payload.",
2414
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
2515
"defaultValue": "none",
2616
"deprecation": {
27-
"level": "error",
28-
"replacement": "management.opentelemetry.logging.export.otlp.compression",
29-
"since": "4.0.0"
17+
"level": "error",
18+
"replacement": "management.opentelemetry.logging.export.otlp.compression",
19+
"since": "4.0.0"
3020
}
3121
},
3222
{
@@ -36,9 +26,9 @@
3626
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
3727
"defaultValue": "10s",
3828
"deprecation": {
39-
"level": "error",
40-
"replacement": "management.opentelemetry.logging.export.otlp.connect-timeout",
41-
"since": "4.0.0"
29+
"level": "error",
30+
"replacement": "management.opentelemetry.logging.export.otlp.connect-timeout",
31+
"since": "4.0.0"
4232
}
4333
},
4434
{
@@ -47,17 +37,17 @@
4737
"description": "URL to the OTel collector's HTTP API.",
4838
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
4939
"deprecation": {
50-
"level": "error",
51-
"replacement": "management.opentelemetry.logging.export.otlp.endpoint",
52-
"since": "4.0.0"
40+
"level": "error",
41+
"replacement": "management.opentelemetry.logging.export.otlp.endpoint",
42+
"since": "4.0.0"
5343
}
5444
},
55-
{
45+
{
5646
"name": "management.otlp.logging.export.enabled",
5747
"deprecation": {
58-
"level": "error",
59-
"replacement": "management.logging.export.otlp.enabled",
60-
"since": "4.0.0"
48+
"level": "error",
49+
"replacement": "management.logging.export.otlp.enabled",
50+
"since": "4.0.0"
6151
}
6252
},
6353
{
@@ -66,9 +56,9 @@
6656
"description": "Custom HTTP headers you want to pass to the collector, for example auth headers.",
6757
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
6858
"deprecation": {
69-
"level": "error",
70-
"replacement": "management.opentelemetry.logging.export.otlp.headers",
71-
"since": "4.0.0"
59+
"level": "error",
60+
"replacement": "management.opentelemetry.logging.export.otlp.headers",
61+
"since": "4.0.0"
7262
}
7363
},
7464
{
@@ -78,9 +68,9 @@
7868
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
7969
"defaultValue": "10s",
8070
"deprecation": {
81-
"level": "error",
82-
"replacement": "management.opentelemetry.logging.export.otlp.timeout",
83-
"since": "4.0.0"
71+
"level": "error",
72+
"replacement": "management.opentelemetry.logging.export.otlp.timeout",
73+
"since": "4.0.0"
8474
}
8575
},
8676
{
@@ -90,9 +80,9 @@
9080
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
9181
"defaultValue": "http",
9282
"deprecation": {
93-
"level": "error",
94-
"replacement": "management.opentelemetry.logging.export.otlp.transport",
95-
"since": "4.0.0"
83+
"level": "error",
84+
"replacement": "management.opentelemetry.logging.export.otlp.transport",
85+
"since": "4.0.0"
9686
}
9787
}
9888
],

0 commit comments

Comments
 (0)