Merge remote-tracking branch 'otel/main' into health-metrics

Author: JonasKunz

api/incubator/src/test/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtilTest.java

@@ -24,7 +24,7 @@ class InstrumentationConfigUtilTest {
    * href="https://github.com/open-telemetry/opentelemetry-configuration/blob/main/examples/kitchen-sink.yaml">kitchen-sink.yaml</a>.
    */
   private static final String kitchenSinkInstrumentationConfig =
-      "instrumentation:\n"
+      "instrumentation/development:\n"
           + "  general:\n"
           + "    peer:\n"
           + "      service_mapping:\n"
@@ -54,11 +54,11 @@ class InstrumentationConfigUtilTest {
   private static final ConfigProvider kitchenSinkConfigProvider =
       toConfigProvider(kitchenSinkInstrumentationConfig);
   private static final ConfigProvider emptyInstrumentationConfigProvider =
-      toConfigProvider("instrumentation:\n");
+      toConfigProvider("instrumentation/development:\n");
   private static final ConfigProvider emptyGeneralConfigProvider =
-      toConfigProvider("instrumentation:\n  general:\n");
+      toConfigProvider("instrumentation/development:\n  general:\n");
   private static final ConfigProvider emptyHttpConfigProvider =
-      toConfigProvider("instrumentation:\n  general:\n    http:\n");
+      toConfigProvider("instrumentation/development:\n  general:\n    http:\n");
 
   private static ConfigProvider toConfigProvider(String configYaml) {
     OpenTelemetryConfigurationModel configuration =

buildSrc/build.gradle.kts

@@ -54,7 +54,7 @@ dependencies {
   implementation("com.google.auto.value:auto-value-annotations:1.11.0")
   // When updating, update above in plugins too
   implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.3")
-  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.0.1")
+  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.0.2")
   implementation("com.squareup:javapoet:1.13.0")
   implementation("com.squareup.wire:wire-compiler")
   implementation("com.squareup.wire:wire-gradle-plugin")

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -42,7 +42,7 @@ java {
 
 checkstyle {
   configDirectory.set(file("$rootDir/buildscripts/"))
-  toolVersion = "10.23.1"
+  toolVersion = "10.24.0"
   isIgnoreFailures = false
   configProperties["rootDir"] = rootDir
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java

@@ -72,7 +72,7 @@ void setup() throws IOException {
             + "    - simple:\n"
             + "        exporter:\n"
             + "          console: {}\n"
-            + "instrumentation:\n"
+            + "instrumentation/development:\n"
             + "  general:\n"
             + "    http:\n"
             + "      client:\n"

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SdkConfigProvider.java

@@ -18,7 +18,7 @@ public final class SdkConfigProvider implements ConfigProvider {
   private SdkConfigProvider(OpenTelemetryConfigurationModel model) {
     DeclarativeConfigProperties configProperties =
         DeclarativeConfiguration.toConfigProperties(model);
-    this.instrumentationConfig = configProperties.getStructured("instrumentation");
+    this.instrumentationConfig = configProperties.getStructured("instrumentation/development");
   }
 
   /**

settings.gradle.kts

@@ -1,7 +1,7 @@
 pluginManagement {
   plugins {
     id("com.gradleup.shadow") version "8.3.6"
-    id("com.gradle.develocity") version "4.0.1"
+    id("com.gradle.develocity") version "4.0.2"
     id("de.undercouch.download") version "5.6.0"
     id("org.jsonschema2pojo") version "1.2.2"
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"