GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Polish "Add since to deprecations in config metadata JSON files" 

See gh-47972
See gh-47980
pull/48124/head
Stéphane Nicoll 1 month ago
parent
5281f5c6bc
commit
a4ff1e51da
3 changed files with 40 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      module/spring-boot-kafka/src/main/resources/META-INF/additional-spring-configuration-metadata.json
  2. 32
      module/spring-boot-micrometer-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json
  3. 58
      module/spring-boot-opentelemetry/src/main/resources/META-INF/additional-spring-configuration-metadata.json

2
module/spring-boot-kafka/src/main/resources/META-INF/additional-spring-configuration-metadata.json
Unescape View File

@ -152,7 +152,7 @@
"name": "spring.kafka.retry.topic.max-delay", "name": "spring.kafka.retry.topic.max-delay",
"type": "java.time.Duration", "type": "java.time.Duration",
"deprecation": { "deprecation": {
"replacement": "spring.kafka.retry.topic.backoff.maxDelay", "replacement": "spring.kafka.retry.topic.backoff.max-delay",
"since": "3.4.0" "since": "3.4.0"
} }
}, },

32
module/spring-boot-micrometer-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json
Unescape View File

@ -14,7 +14,6 @@
"defaultValue": true, "defaultValue": true,
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.metrics.enable.process.files",
"reason": "Instead, filter 'process.files' metrics.", "reason": "Instead, filter 'process.files' metrics.",
"since": "2.1.0" "since": "2.1.0"
} }
@ -26,7 +25,6 @@
"defaultValue": true, "defaultValue": true,
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.metrics.enable.jvm",
"reason": "Instead, disable JvmMetricsAutoConfiguration or filter 'jvm' metrics.", "reason": "Instead, disable JvmMetricsAutoConfiguration or filter 'jvm' metrics.",
"since": "2.1.0" "since": "2.1.0"
} }
@ -38,7 +36,6 @@
"defaultValue": true, "defaultValue": true,
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.metrics.enable.logback",
"reason": "Instead, disable LogbackMetricsAutoConfiguration or filter 'logback' metrics.", "reason": "Instead, disable LogbackMetricsAutoConfiguration or filter 'logback' metrics.",
"since": "2.1.0" "since": "2.1.0"
} }
@ -409,7 +406,7 @@
"type": "java.lang.String", "type": "java.lang.String",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.dynatrace.metrics.export.device-id", "replacement": "management.dynatrace.metrics.export.v1.device-id",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -427,7 +424,7 @@
"type": "java.lang.String", "type": "java.lang.String",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.dynatrace.metrics.export.group", "replacement": "management.dynatrace.metrics.export.v1.group",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -462,7 +459,7 @@
"type": "java.lang.String", "type": "java.lang.String",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.dynatrace.metrics.export.technology-type", "replacement": "management.dynatrace.metrics.export.v1.technology-type",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -1336,7 +1333,7 @@
"type": "io.micrometer.prometheus.HistogramFlavor", "type": "io.micrometer.prometheus.HistogramFlavor",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.prometheus.metrics.export.histogram-flavor", "reason": "No longer supported by the Prometheus client.",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -1345,7 +1342,7 @@
"type": "java.lang.String", "type": "java.lang.String",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.prometheus.metrics.export.pushgateway.base-url", "replacement": "management.prometheus.metrics.export.pushgateway.address",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -1426,7 +1423,7 @@
"type": "java.lang.String", "type": "java.lang.String",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.signalfx.metrics.export.access-token", "reason": "SignalFX is no longer supported.",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -1435,7 +1432,7 @@
"type": "java.lang.Integer", "type": "java.lang.Integer",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.signalfx.metrics.export.batch-size", "reason": "SignalFX is no longer supported.",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -1444,7 +1441,7 @@
"type": "java.time.Duration", "type": "java.time.Duration",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.signalfx.metrics.export.connect-timeout", "reason": "SignalFX is no longer supported.",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -1453,7 +1450,7 @@
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.signalfx.metrics.export.enabled", "reason": "SignalFX is no longer supported.",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -1462,6 +1459,7 @@
"type": "java.lang.Integer", "type": "java.lang.Integer",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"reason": "SignalFX is no longer supported.",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -1469,7 +1467,7 @@
"name": "management.metrics.export.signalfx.published-histogram-type", "name": "management.metrics.export.signalfx.published-histogram-type",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.signalfx.metrics.export.published-histogram-type", "reason": "SignalFX is no longer supported.",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -1478,7 +1476,7 @@
"type": "java.time.Duration", "type": "java.time.Duration",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.signalfx.metrics.export.read-timeout", "reason": "SignalFX is no longer supported.",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -1487,7 +1485,7 @@
"type": "java.lang.String", "type": "java.lang.String",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.signalfx.metrics.export.source", "reason": "SignalFX is no longer supported.",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -1496,7 +1494,7 @@
"type": "java.time.Duration", "type": "java.time.Duration",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.signalfx.metrics.export.step", "reason": "SignalFX is no longer supported.",
"since": "3.0.0" "since": "3.0.0"
} }
}, },
@ -1505,7 +1503,7 @@
"type": "java.lang.String", "type": "java.lang.String",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.signalfx.metrics.export.uri", "reason": "SignalFX is no longer supported.",
"since": "3.0.0" "since": "3.0.0"
} }
}, },

58
module/spring-boot-opentelemetry/src/main/resources/META-INF/additional-spring-configuration-metadata.json
Unescape View File

@ -4,29 +4,19 @@
{ {
"name": "management.logging.export.otlp.enabled", "name": "management.logging.export.otlp.enabled",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
"defaultValue": true, "defaultValue": true,
"description": "Whether auto-configuration of logging is enabled to export logs over OTLP." "description": "Whether auto-configuration of logging is enabled to export logs over OTLP."
},
{
"name": "management.otlp.logging",
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
"deprecation": {
"level": "error",
"replacement": "management.opentelemetry.logging.export.otlp",
"since": "4.0.0"
}
}, },
{ {
"name": "management.otlp.logging.compression", "name": "management.otlp.logging.compression",
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties$Compression", "type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties$Compression",
"description": "Method used to compress the payload.", "description": "Method used to compress the payload.",
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties", "sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
"defaultValue": "none", "defaultValue": "none",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.opentelemetry.logging.export.otlp.compression", "replacement": "management.opentelemetry.logging.export.otlp.compression",
"since": "4.0.0" "since": "4.0.0"
} }
}, },
{ {
@ -36,9 +26,9 @@
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties", "sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
"defaultValue": "10s", "defaultValue": "10s",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.opentelemetry.logging.export.otlp.connect-timeout", "replacement": "management.opentelemetry.logging.export.otlp.connect-timeout",
"since": "4.0.0" "since": "4.0.0"
} }
}, },
{ {
@ -47,17 +37,17 @@
"description": "URL to the OTel collector's HTTP API.", "description": "URL to the OTel collector's HTTP API.",
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties", "sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.opentelemetry.logging.export.otlp.endpoint", "replacement": "management.opentelemetry.logging.export.otlp.endpoint",
"since": "4.0.0" "since": "4.0.0"
} }
}, },
{ {
"name": "management.otlp.logging.export.enabled", "name": "management.otlp.logging.export.enabled",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.logging.export.otlp.enabled", "replacement": "management.logging.export.otlp.enabled",
"since": "4.0.0" "since": "4.0.0"
} }
}, },
{ {
@ -66,9 +56,9 @@
"description": "Custom HTTP headers you want to pass to the collector, for example auth headers.", "description": "Custom HTTP headers you want to pass to the collector, for example auth headers.",
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties", "sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.opentelemetry.logging.export.otlp.headers", "replacement": "management.opentelemetry.logging.export.otlp.headers",
"since": "4.0.0" "since": "4.0.0"
} }
}, },
{ {
@ -78,9 +68,9 @@
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties", "sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
"defaultValue": "10s", "defaultValue": "10s",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.opentelemetry.logging.export.otlp.timeout", "replacement": "management.opentelemetry.logging.export.otlp.timeout",
"since": "4.0.0" "since": "4.0.0"
} }
}, },
{ {
@ -90,9 +80,9 @@
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties", "sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
"defaultValue": "http", "defaultValue": "http",
"deprecation": { "deprecation": {
"level": "error", "level": "error",
"replacement": "management.opentelemetry.logging.export.otlp.transport", "replacement": "management.opentelemetry.logging.export.otlp.transport",
"since": "4.0.0" "since": "4.0.0"
} }
} }
], ],

Write Preview
Loading…
Cancel
Save