Skip to content

Commit f6f1d57

Browse files
snicollsnicoll
committed
Merge pull request #50375 from Kimgyuilli
* fix-stale-configuration-metadata-source-types: Fix stale type references in configuration metadata Closes gh-50375
2 parents 2382922 + ed6c375 commit f6f1d57

5 files changed

Lines changed: 86 additions & 86 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
},
202202
{
203203
"name": "management.wavefront.api-token-type",
204-
"type": "org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontProperties$TokenType",
204+
"type": "java.lang.String",
205205
"deprecation": {
206206
"level": "error",
207207
"reason": "Wavefront is end-of-life.",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
{
4646
"name": "spring.datasource.initialization-mode",
47-
"type": "org.springframework.boot.jdbc.DataSourceInitializationMode",
47+
"type": "org.springframework.boot.sql.init.DatabaseInitializationMode",
4848
"deprecation": {
4949
"level": "error",
5050
"replacement": "spring.sql.init.mode",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{
1111
"name": "spring.mail.test-connection",
1212
"description": "Whether to test that the mail server is available on startup.",
13-
"sourceType": "org.springframework.boot.autoconfigure.mail.MailProperties",
13+
"sourceType": "org.springframework.boot.mail.autoconfigure.MailSenderValidatorAutoConfiguration",
1414
"type": "java.lang.Boolean",
1515
"defaultValue": false
1616
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,7 @@
13931393
},
13941394
{
13951395
"name": "management.metrics.export.prometheus.pushgateway.shutdown-operation",
1396-
"type": "org.springframework.boot.actuate.metrics.export.prometheus.PrometheusPushGatewayManager$ShutdownOperation",
1396+
"type": "org.springframework.boot.micrometer.metrics.export.prometheus.PrometheusPushGatewayManager$ShutdownOperation",
13971397
"deprecation": {
13981398
"level": "error",
13991399
"replacement": "management.prometheus.metrics.export.pushgateway.shutdown-operation",

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

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,84 @@
11
{
2-
"groups": [],
3-
"properties": [
4-
{
5-
"name": "management.logging.export.otlp.enabled",
6-
"type": "java.lang.Boolean",
7-
"defaultValue": true,
8-
"description": "Whether auto-configuration of logging is enabled to export logs over OTLP."
9-
},
10-
{
11-
"name": "management.otlp.logging.compression",
12-
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties$Compression",
13-
"description": "Method used to compress the payload.",
14-
"defaultValue": "none",
15-
"deprecation": {
16-
"level": "error",
17-
"replacement": "management.opentelemetry.logging.export.otlp.compression",
18-
"since": "4.0.0"
19-
}
20-
},
21-
{
22-
"name": "management.otlp.logging.connect-timeout",
23-
"type": "java.time.Duration",
24-
"description": "Connect timeout for the OTel collector connection.",
25-
"defaultValue": "10s",
26-
"deprecation": {
27-
"level": "error",
28-
"replacement": "management.opentelemetry.logging.export.otlp.connect-timeout",
29-
"since": "4.0.0"
30-
}
31-
},
32-
{
33-
"name": "management.otlp.logging.endpoint",
34-
"type": "java.lang.String",
35-
"description": "URL to the OTel collector's HTTP API.",
36-
"deprecation": {
37-
"level": "error",
38-
"replacement": "management.opentelemetry.logging.export.otlp.endpoint",
39-
"since": "4.0.0"
40-
}
41-
},
42-
{
43-
"name": "management.otlp.logging.export.enabled",
44-
"deprecation": {
45-
"level": "error",
46-
"replacement": "management.logging.export.otlp.enabled",
47-
"since": "4.0.0"
48-
}
49-
},
50-
{
51-
"name": "management.otlp.logging.headers",
52-
"type": "java.util.Map<java.lang.String,java.lang.String>",
53-
"description": "Custom HTTP headers you want to pass to the collector, for example auth headers.",
54-
"deprecation": {
55-
"level": "error",
56-
"replacement": "management.opentelemetry.logging.export.otlp.headers",
57-
"since": "4.0.0"
58-
}
59-
},
60-
{
61-
"name": "management.otlp.logging.timeout",
62-
"type": "java.time.Duration",
63-
"description": "Call timeout for the OTel Collector to process an exported batch of data. This timeout spans the entire call: resolving DNS, connecting, writing the request body, server processing, and reading the response body. If the call requires redirects or retries all must complete within one timeout period.",
64-
"defaultValue": "10s",
65-
"deprecation": {
66-
"level": "error",
67-
"replacement": "management.opentelemetry.logging.export.otlp.timeout",
68-
"since": "4.0.0"
69-
}
70-
},
71-
{
72-
"name": "management.otlp.logging.transport",
73-
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.Transport",
74-
"description": "Transport used to send the logs.",
75-
"defaultValue": "http",
76-
"deprecation": {
77-
"level": "error",
78-
"replacement": "management.opentelemetry.logging.export.otlp.transport",
79-
"since": "4.0.0"
80-
}
81-
}
82-
],
83-
"hints": []
2+
"groups": [],
3+
"properties": [
4+
{
5+
"name": "management.logging.export.otlp.enabled",
6+
"type": "java.lang.Boolean",
7+
"defaultValue": true,
8+
"description": "Whether auto-configuration of logging is enabled to export logs over OTLP."
9+
},
10+
{
11+
"name": "management.otlp.logging.compression",
12+
"type": "org.springframework.boot.opentelemetry.autoconfigure.logging.otlp.OtlpLoggingProperties$Compression",
13+
"description": "Method used to compress the payload.",
14+
"defaultValue": "none",
15+
"deprecation": {
16+
"level": "error",
17+
"replacement": "management.opentelemetry.logging.export.otlp.compression",
18+
"since": "4.0.0"
19+
}
20+
},
21+
{
22+
"name": "management.otlp.logging.connect-timeout",
23+
"type": "java.time.Duration",
24+
"description": "Connect timeout for the OTel collector connection.",
25+
"defaultValue": "10s",
26+
"deprecation": {
27+
"level": "error",
28+
"replacement": "management.opentelemetry.logging.export.otlp.connect-timeout",
29+
"since": "4.0.0"
30+
}
31+
},
32+
{
33+
"name": "management.otlp.logging.endpoint",
34+
"type": "java.lang.String",
35+
"description": "URL to the OTel collector's HTTP API.",
36+
"deprecation": {
37+
"level": "error",
38+
"replacement": "management.opentelemetry.logging.export.otlp.endpoint",
39+
"since": "4.0.0"
40+
}
41+
},
42+
{
43+
"name": "management.otlp.logging.export.enabled",
44+
"deprecation": {
45+
"level": "error",
46+
"replacement": "management.logging.export.otlp.enabled",
47+
"since": "4.0.0"
48+
}
49+
},
50+
{
51+
"name": "management.otlp.logging.headers",
52+
"type": "java.util.Map<java.lang.String,java.lang.String>",
53+
"description": "Custom HTTP headers you want to pass to the collector, for example auth headers.",
54+
"deprecation": {
55+
"level": "error",
56+
"replacement": "management.opentelemetry.logging.export.otlp.headers",
57+
"since": "4.0.0"
58+
}
59+
},
60+
{
61+
"name": "management.otlp.logging.timeout",
62+
"type": "java.time.Duration",
63+
"description": "Call timeout for the OTel Collector to process an exported batch of data. This timeout spans the entire call: resolving DNS, connecting, writing the request body, server processing, and reading the response body. If the call requires redirects or retries all must complete within one timeout period.",
64+
"defaultValue": "10s",
65+
"deprecation": {
66+
"level": "error",
67+
"replacement": "management.opentelemetry.logging.export.otlp.timeout",
68+
"since": "4.0.0"
69+
}
70+
},
71+
{
72+
"name": "management.otlp.logging.transport",
73+
"type": "org.springframework.boot.opentelemetry.autoconfigure.logging.otlp.Transport",
74+
"description": "Transport used to send the logs.",
75+
"defaultValue": "http",
76+
"deprecation": {
77+
"level": "error",
78+
"replacement": "management.opentelemetry.logging.export.otlp.transport",
79+
"since": "4.0.0"
80+
}
81+
}
82+
],
83+
"hints": []
8484
}

0 commit comments

Comments
 (0)