Merge branch '3.1.x'

mhalbritter · mhalbritter · commit a0fc2d48cd4e · 2023-12-05T11:19:32.000+01:00
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
@@ -2210,6 +2210,12 @@
         "level": "error"
       }
     },
+    {
+      "name": "management.tracing.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether auto-configuration of tracing is enabled to export and propagate traces.",
+      "defaultValue": true
+    },
     {
       "name": "management.tracing.propagation.consume",
       "defaultValue": [

Original file line number	Diff line number	Diff line change
`@@ -2210,6 +2210,12 @@`
`2210`	`2210`	`"level": "error"`
`2211`	`2211`	`}`
`2212`	`2212`	`},`
	`2213`	`+ {`
	`2214`	`+ "name": "management.tracing.enabled",`
	`2215`	`+ "type": "java.lang.Boolean",`
	`2216`	`+ "description": "Whether auto-configuration of tracing is enabled to export and propagate traces.",`
	`2217`	`+ "defaultValue": true`
	`2218`	`+ },`
`2213`	`2219`	`{`
`2214`	`2220`	`"name": "management.tracing.propagation.consume",`
`2215`	`2221`	`"defaultValue": [`