update to latest with single file schema

Author: jack-berg

api/incubator/src/testConvertToModel/java/io/opentelemetry/api/incubator/InstrumentationConfigUtilTest.java

@@ -16,9 +16,9 @@
 import io.opentelemetry.api.incubator.config.InstrumentationConfigUtil;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalInstrumentationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.InstrumentationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
@@ -133,7 +133,8 @@ private static ConfigProvider withInstrumentationConfig(
 
     return SdkConfigProvider.create(
         new OpenTelemetryConfigurationModel()
-            .withInstrumentationDevelopment(new InstrumentationModel().withJava(javaConfig)));
+            .withInstrumentationDevelopment(
+                new ExperimentalInstrumentationModel().withJava(javaConfig)));
   }
 
   private static class Model {

sdk-extensions/incubator/build.gradle.kts

@@ -60,7 +60,7 @@ dependencies {
 // ... proceed with normal sourcesJar, compileJava, etc
 
 val configurationTag = "1.0.0-rc.1"
-val configurationRef = "be1a43de6745da73ce1b6339c34b1e260e5b135b" // Replace with commit SHA to point to experiment with a specific commit
+val configurationRef = "8826969b88d4ec720c3ebfe5c95b27aca5c238a9" // Replace with commit SHA to point to experiment with a specific commit
 val configurationRepoZip = "https://github.com/open-telemetry/opentelemetry-configuration/archive/$configurationRef.zip"
 val buildDirectory = layout.buildDirectory.asFile.get()
 
@@ -88,7 +88,7 @@ val deleteTypeDescriptions by tasks.registering(Delete::class) {
 }
 
 jsonSchema2Pojo {
-  sourceFiles = setOf(file("$buildDirectory/configuration/schema"))
+  sourceFiles = setOf(file("$buildDirectory/configuration/opentelemetry_configuration.json"))
   targetDirectory = file("$buildDirectory/generated/sources/js2p/java/main")
   targetPackage = "io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model"
 
@@ -112,10 +112,6 @@ jsonSchema2Pojo {
 
   // Append Model as suffix to the generated classes.
   classNameSuffix = "Model"
-
-  fileFilter = FileFilter {
-    it.path.endsWith(".json")
-  }
 }
 
 val generateJsonSchema2Pojo = tasks.getByName("generateJsonSchema2Pojo")

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationParseTest.java

@@ -30,6 +30,7 @@
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalHttpClientInstrumentationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalHttpInstrumentationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalHttpServerInstrumentationModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalInstrumentationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLoggerConfigModel;
@@ -55,7 +56,6 @@
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.GrpcTlsModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.HttpTlsModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.InstrumentationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.JaegerPropagatorModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordLimitsModel;
@@ -674,8 +674,8 @@ void parse_KitchenSinkExampleFile() throws IOException {
     // end MeterProvider config
 
     // start instrumentation config
-    InstrumentationModel instrumentation =
-        new InstrumentationModel()
+    ExperimentalInstrumentationModel instrumentation =
+        new ExperimentalInstrumentationModel()
             .withGeneral(
                 new ExperimentalGeneralInstrumentationModel()
                     .withPeer(
@@ -830,7 +830,8 @@ void parse_KitchenSinkExampleFile() throws IOException {
       assertThat(configMeterProvider).isEqualTo(meterProvider);
 
       // Instrumentation config
-      InstrumentationModel configInstrumentation = config.getInstrumentationDevelopment();
+      ExperimentalInstrumentationModel configInstrumentation =
+          config.getInstrumentationDevelopment();
       assertThat(configInstrumentation).isEqualTo(instrumentation);
 
       // All configuration