Merge branch '3.2.x' into 3.3.x

Closes gh-41676
spring-projects · Aug 1, 2024 · c272090 · c272090
2 parents 58ff683 + 4d66084
commit c272090
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...r-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...r-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"