Merge branch 'open-telemetry:main' into main

Author: dsgrieve

.github/component_owners.yml

@@ -41,6 +41,7 @@ components:
     - sfriberg
   jmx-metrics:
     - breedx-splk
+    - sylvainjuge
   jmx-scraper:
     - breedx-splk
     - robsunday

jmx-metrics/README.md

@@ -278,6 +278,7 @@ file contents can also be provided via stdin on startup when using `-config -` a
 ## Component owners
 
 - [Jason Plumb](https://github.com/breedx-splk), Splunk
+- [Sylvain Juge](https://github.com/sylvainjuge), Elastic
 
 ## Emeritus owners
 

jmx-scraper/README.md

@@ -6,3 +6,11 @@ The JMX MBeans and their metric mappings are defined in YAML and reuse implement
 
 This is currently a work-in-progress component not ready to be used in production.
 The end goal is to provide an alternative to the [JMX Gatherer](../jmx-metrics/README.md) utility.
+
+## Component owners
+
+- [Jason Plumb](https://github.com/breedx-splk), Splunk
+- [Robert Niedziela](https://github.com/robsunday), Splunk
+- [Sylvain Juge](https://github.com/sylvainjuge), Elastic
+
+Learn more about component owners in [component_owners.yml](../.github/component_owners.yml).

micrometer-meter-provider/build.gradle.kts

@@ -20,14 +20,14 @@ dependencies {
   annotationProcessor("com.google.auto.value:auto-value")
   compileOnly("com.google.auto.value:auto-value-annotations")
 
-  testImplementation("io.micrometer:micrometer-core:1.13.5")
+  testImplementation("io.micrometer:micrometer-core:1.13.6")
 }
 
 testing {
   suites {
     val integrationTest by registering(JvmTestSuite::class) {
       dependencies {
-        implementation("io.micrometer:micrometer-registry-prometheus:1.13.5")
+        implementation("io.micrometer:micrometer-registry-prometheus:1.13.6")
       }
     }
   }