Merge branch '3.3.x'

snicoll · snicoll · commit eb8fe66cb808 · 2024-09-09T15:42:31.000+02:00
Closes gh-42194
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1910,15 +1910,15 @@
       "defaultValue": true,
       "deprecation": {
         "level": "error",
-        "reason": "Should be applied at the ObservationRegistry level."
+        "reason": "Requests are timed automatically."
       }
     },
     {
       "name": "management.metrics.graphql.autotime.percentiles",
       "description": "Computed non-aggregable percentiles to publish.",
       "deprecation": {
         "level": "error",
-        "reason": "Should be applied at the ObservationRegistry level."
+        "reason": "Should be configured globally via management.metrics.distribution.percentiles."
       }
     },
     {
@@ -1927,7 +1927,7 @@
       "defaultValue": false,
       "deprecation": {
         "level": "error",
-        "reason": "Should be applied at the ObservationRegistry level."
+        "reason": "Should be configured globally via management.metrics.distribution.percentiles-histogram."
       }
     },
     {
@@ -1953,15 +1953,15 @@
       "defaultValue": true,
       "deprecation": {
         "level": "error",
-        "reason": "Should be applied at the ObservationRegistry level."
+        "reason": "Requests are timed automatically."
       }
     },
     {
       "name": "management.metrics.web.client.request.autotime.percentiles",
       "description": "Computed non-aggregable percentiles to publish.",
       "deprecation": {
         "level": "error",
-        "reason": "Should be applied at the ObservationRegistry level."
+        "reason": "Should be configured globally via management.metrics.distribution.percentiles."
       }
     },
     {
@@ -1970,7 +1970,7 @@
       "defaultValue": false,
       "deprecation": {
         "level": "error",
-        "reason": "Should be applied at the ObservationRegistry level."
+        "reason": "Should be configured globally via management.metrics.distribution.percentiles-histogram."
       }
     },
     {
@@ -2003,15 +2003,15 @@
       "defaultValue": true,
       "deprecation": {
         "level": "error",
-        "reason": "Should be applied at the ObservationRegistry level."
+        "reason": "Requests are timed automatically."
       }
     },
     {
       "name": "management.metrics.web.server.request.autotime.percentiles",
       "description": "Computed non-aggregable percentiles to publish.",
       "deprecation": {
         "level": "error",
-        "reason": "Should be applied at the ObservationRegistry level."
+        "reason": "Should be configured globally via management.metrics.distribution.percentiles."
       }
     },
     {
@@ -2020,7 +2020,7 @@
       "defaultValue": false,
       "deprecation": {
         "level": "error",
-        "reason": "Should be applied at the ObservationRegistry level."
+        "reason": "Should be configured globally via management.metrics.distribution.percentiles-histogram."
       }
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -1910,15 +1910,15 @@`
`1910`	`1910`	`"defaultValue": true,`
`1911`	`1911`	`"deprecation": {`
`1912`	`1912`	`"level": "error",`
`1913`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`1913`	`+ "reason": "Requests are timed automatically."`
`1914`	`1914`	`}`
`1915`	`1915`	`},`
`1916`	`1916`	`{`
`1917`	`1917`	`"name": "management.metrics.graphql.autotime.percentiles",`
`1918`	`1918`	`"description": "Computed non-aggregable percentiles to publish.",`
`1919`	`1919`	`"deprecation": {`
`1920`	`1920`	`"level": "error",`
`1921`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`1921`	`+ "reason": "Should be configured globally via management.metrics.distribution.percentiles."`
`1922`	`1922`	`}`
`1923`	`1923`	`},`
`1924`	`1924`	`{`
`@@ -1927,7 +1927,7 @@`
`1927`	`1927`	`"defaultValue": false,`
`1928`	`1928`	`"deprecation": {`
`1929`	`1929`	`"level": "error",`
`1930`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`1930`	`+ "reason": "Should be configured globally via management.metrics.distribution.percentiles-histogram."`
`1931`	`1931`	`}`
`1932`	`1932`	`},`
`1933`	`1933`	`{`
`@@ -1953,15 +1953,15 @@`
`1953`	`1953`	`"defaultValue": true,`
`1954`	`1954`	`"deprecation": {`
`1955`	`1955`	`"level": "error",`
`1956`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`1956`	`+ "reason": "Requests are timed automatically."`
`1957`	`1957`	`}`
`1958`	`1958`	`},`
`1959`	`1959`	`{`
`1960`	`1960`	`"name": "management.metrics.web.client.request.autotime.percentiles",`
`1961`	`1961`	`"description": "Computed non-aggregable percentiles to publish.",`
`1962`	`1962`	`"deprecation": {`
`1963`	`1963`	`"level": "error",`
`1964`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`1964`	`+ "reason": "Should be configured globally via management.metrics.distribution.percentiles."`
`1965`	`1965`	`}`
`1966`	`1966`	`},`
`1967`	`1967`	`{`
`@@ -1970,7 +1970,7 @@`
`1970`	`1970`	`"defaultValue": false,`
`1971`	`1971`	`"deprecation": {`
`1972`	`1972`	`"level": "error",`
`1973`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`1973`	`+ "reason": "Should be configured globally via management.metrics.distribution.percentiles-histogram."`
`1974`	`1974`	`}`
`1975`	`1975`	`},`
`1976`	`1976`	`{`
`@@ -2003,15 +2003,15 @@`
`2003`	`2003`	`"defaultValue": true,`
`2004`	`2004`	`"deprecation": {`
`2005`	`2005`	`"level": "error",`
`2006`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`2006`	`+ "reason": "Requests are timed automatically."`
`2007`	`2007`	`}`
`2008`	`2008`	`},`
`2009`	`2009`	`{`
`2010`	`2010`	`"name": "management.metrics.web.server.request.autotime.percentiles",`
`2011`	`2011`	`"description": "Computed non-aggregable percentiles to publish.",`
`2012`	`2012`	`"deprecation": {`
`2013`	`2013`	`"level": "error",`
`2014`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`2014`	`+ "reason": "Should be configured globally via management.metrics.distribution.percentiles."`
`2015`	`2015`	`}`
`2016`	`2016`	`},`
`2017`	`2017`	`{`
`@@ -2020,7 +2020,7 @@`
`2020`	`2020`	`"defaultValue": false,`
`2021`	`2021`	`"deprecation": {`
`2022`	`2022`	`"level": "error",`
`2023`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`2023`	`+ "reason": "Should be configured globally via management.metrics.distribution.percentiles-histogram."`
`2024`	`2024`	`}`
`2025`	`2025`	`},`
`2026`	`2026`	`{`