Merge branch '3.2.x' into 3.3.x

Closes gh-41676
2024-08-01 14:27:20 +02:00
parent 58ff683a0f 4d66084c73
commit c27209085c
1 changed files with 4 additions and 0 deletions
--- 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
@@ -2089,6 +2089,10 @@
      "description": "Whether auto-configuration of Micrometer annotations is enabled.",
      "defaultValue": false
    },
+    {
+      "name": "management.otlp.metrics.export.aggregation-temporality",
+      "defaultValue": "cumulative"
+    },
    {
      "name": "management.otlp.metrics.export.base-time-unit",
      "defaultValue": "milliseconds"