Merge branch '3.2.x' into 3.3.x

snicoll · snicoll · commit 0cef42c2b1be · 2024-09-09T15:42:22.000+02:00
Closes gh-42193
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
@@ -1942,15 +1942,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."
       }
     },
     {
@@ -1959,7 +1959,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."
       }
     },
     {
@@ -1985,15 +1985,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."
       }
     },
     {
@@ -2002,7 +2002,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."
       }
     },
     {
@@ -2035,15 +2035,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."
       }
     },
     {
@@ -2052,7 +2052,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
`@@ -1942,15 +1942,15 @@`
`1942`	`1942`	`"defaultValue": true,`
`1943`	`1943`	`"deprecation": {`
`1944`	`1944`	`"level": "error",`
`1945`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`1945`	`+ "reason": "Requests are timed automatically."`
`1946`	`1946`	`}`
`1947`	`1947`	`},`
`1948`	`1948`	`{`
`1949`	`1949`	`"name": "management.metrics.graphql.autotime.percentiles",`
`1950`	`1950`	`"description": "Computed non-aggregable percentiles to publish.",`
`1951`	`1951`	`"deprecation": {`
`1952`	`1952`	`"level": "error",`
`1953`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`1953`	`+ "reason": "Should be configured globally via management.metrics.distribution.percentiles."`
`1954`	`1954`	`}`
`1955`	`1955`	`},`
`1956`	`1956`	`{`
`@@ -1959,7 +1959,7 @@`
`1959`	`1959`	`"defaultValue": false,`
`1960`	`1960`	`"deprecation": {`
`1961`	`1961`	`"level": "error",`
`1962`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`1962`	`+ "reason": "Should be configured globally via management.metrics.distribution.percentiles-histogram."`
`1963`	`1963`	`}`
`1964`	`1964`	`},`
`1965`	`1965`	`{`
`@@ -1985,15 +1985,15 @@`
`1985`	`1985`	`"defaultValue": true,`
`1986`	`1986`	`"deprecation": {`
`1987`	`1987`	`"level": "error",`
`1988`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`1988`	`+ "reason": "Requests are timed automatically."`
`1989`	`1989`	`}`
`1990`	`1990`	`},`
`1991`	`1991`	`{`
`1992`	`1992`	`"name": "management.metrics.web.client.request.autotime.percentiles",`
`1993`	`1993`	`"description": "Computed non-aggregable percentiles to publish.",`
`1994`	`1994`	`"deprecation": {`
`1995`	`1995`	`"level": "error",`
`1996`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`1996`	`+ "reason": "Should be configured globally via management.metrics.distribution.percentiles."`
`1997`	`1997`	`}`
`1998`	`1998`	`},`
`1999`	`1999`	`{`
`@@ -2002,7 +2002,7 @@`
`2002`	`2002`	`"defaultValue": false,`
`2003`	`2003`	`"deprecation": {`
`2004`	`2004`	`"level": "error",`
`2005`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`2005`	`+ "reason": "Should be configured globally via management.metrics.distribution.percentiles-histogram."`
`2006`	`2006`	`}`
`2007`	`2007`	`},`
`2008`	`2008`	`{`
`@@ -2035,15 +2035,15 @@`
`2035`	`2035`	`"defaultValue": true,`
`2036`	`2036`	`"deprecation": {`
`2037`	`2037`	`"level": "error",`
`2038`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`2038`	`+ "reason": "Requests are timed automatically."`
`2039`	`2039`	`}`
`2040`	`2040`	`},`
`2041`	`2041`	`{`
`2042`	`2042`	`"name": "management.metrics.web.server.request.autotime.percentiles",`
`2043`	`2043`	`"description": "Computed non-aggregable percentiles to publish.",`
`2044`	`2044`	`"deprecation": {`
`2045`	`2045`	`"level": "error",`
`2046`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`2046`	`+ "reason": "Should be configured globally via management.metrics.distribution.percentiles."`
`2047`	`2047`	`}`
`2048`	`2048`	`},`
`2049`	`2049`	`{`
`@@ -2052,7 +2052,7 @@`
`2052`	`2052`	`"defaultValue": false,`
`2053`	`2053`	`"deprecation": {`
`2054`	`2054`	`"level": "error",`
`2055`		`- "reason": "Should be applied at the ObservationRegistry level."`
	`2055`	`+ "reason": "Should be configured globally via management.metrics.distribution.percentiles-histogram."`
`2056`	`2056`	`}`
`2057`	`2057`	`},`
`2058`	`2058`	`{`