Move SdkConfigProvider, ExtendedOpenTelemetrySdk to opentelemetry-sdk

api/incubator/src/test/java/io/opentelemetry/api/incubator/ExtendedOpenTelemetryTest.java

@@ -12,6 +12,7 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.incubator.config.ConfigProvider;
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.api.incubator.logs.ExtendedDefaultLoggerProvider;
 import io.opentelemetry.api.incubator.logs.ExtendedLogger;
 import io.opentelemetry.api.incubator.metrics.ExtendedDefaultMeterProvider;
@@ -24,10 +25,9 @@
 import io.opentelemetry.api.trace.TracerProvider;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.extension.incubator.ExtendedOpenTelemetrySdk;
 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.OpenTelemetryConfigurationModel;
+import io.opentelemetry.sdk.internal.all.ExtendedOpenTelemetrySdk;
+import io.opentelemetry.sdk.internal.all.SdkConfigProvider;
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -67,7 +67,7 @@ void globalOpenTelemetry() {
     GlobalOpenTelemetry.set(
         ExtendedOpenTelemetrySdk.create(
             OpenTelemetrySdk.builder().build(),
-            SdkConfigProvider.create(new OpenTelemetryConfigurationModel())));
+            SdkConfigProvider.create(DeclarativeConfigProperties.empty())));
     assertThat(GlobalOpenTelemetry.get()).isInstanceOf(ExtendedOpenTelemetry.class);
   }
 
@@ -92,10 +92,10 @@ void instrumentationConfig() {
             + "    example:\n"
             + "      property: \"value\"";
 
-    OpenTelemetryConfigurationModel configuration =
-        DeclarativeConfiguration.parse(
-            new ByteArrayInputStream(configYaml.getBytes(StandardCharsets.UTF_8)));
-    SdkConfigProvider configProvider = SdkConfigProvider.create(configuration);
+    SdkConfigProvider configProvider =
+        SdkConfigProvider.create(
+            DeclarativeConfiguration.toConfigProperties(
+                new ByteArrayInputStream(configYaml.getBytes(StandardCharsets.UTF_8))));
     ExtendedOpenTelemetry openTelemetry =
         ExtendedOpenTelemetrySdk.create(OpenTelemetrySdk.builder().build(), configProvider);
 

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

@@ -9,9 +9,8 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.YamlDeclarativeConfigProperties;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import io.opentelemetry.sdk.internal.all.SdkConfigProvider;
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -61,10 +60,9 @@ class InstrumentationConfigUtilTest {
       toConfigProvider("instrumentation/development:\n  general:\n    http:\n");
 
   private static ConfigProvider toConfigProvider(String configYaml) {
-    OpenTelemetryConfigurationModel configuration =
-        DeclarativeConfiguration.parse(
-            new ByteArrayInputStream(configYaml.getBytes(StandardCharsets.UTF_8)));
-    return SdkConfigProvider.create(configuration);
+    return SdkConfigProvider.create(
+        DeclarativeConfiguration.toConfigProperties(
+            new ByteArrayInputStream(configYaml.getBytes(StandardCharsets.UTF_8))));
   }
 
   @Test

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

@@ -15,11 +15,11 @@
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 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.OpenTelemetryConfigurationModel;
+import io.opentelemetry.sdk.internal.all.SdkConfigProvider;
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -130,11 +130,13 @@ private static ConfigProvider withInstrumentationConfig(
     ExperimentalLanguageSpecificInstrumentationModel javaConfig =
         new ExperimentalLanguageSpecificInstrumentationModel();
     javaConfig.setAdditionalProperty(instrumentationName, instrumentationConfig);
+    DeclarativeConfigProperties modelProperties =
+        DeclarativeConfiguration.toConfigProperties(
+            new OpenTelemetryConfigurationModel()
+                .withInstrumentationDevelopment(
+                    new ExperimentalInstrumentationModel().withJava(javaConfig)));
 
-    return SdkConfigProvider.create(
-        new OpenTelemetryConfigurationModel()
-            .withInstrumentationDevelopment(
-                new ExperimentalInstrumentationModel().withJava(javaConfig)));
+    return SdkConfigProvider.create(modelProperties);
   }
 
   private static class Model {

sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationSpiTest.java

@@ -10,12 +10,12 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.exporter.logging.LoggingSpanExporter;
 import io.opentelemetry.internal.testing.CleanupExtension;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.OpenTelemetrySdkBuilderUtil;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import io.opentelemetry.sdk.internal.all.OpenTelemetrySdkBuilderUtil;
+import io.opentelemetry.sdk.internal.all.SdkConfigProvider;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
@@ -29,7 +29,7 @@ class DeclarativeConfigurationSpiTest {
   @Test
   void configFromSpi() {
     OpenTelemetrySdk expectedSdk =
-        OpenTelemetrySdkBuilderUtil.setSdkConfigProvider(
+        OpenTelemetrySdkBuilderUtil.setConfigProvider(
                 OpenTelemetrySdk.builder()
                     .setTracerProvider(
                         SdkTracerProvider.builder()
@@ -40,7 +40,7 @@ void configFromSpi() {
                             .addSpanProcessor(
                                 SimpleSpanProcessor.create(LoggingSpanExporter.create()))
                             .build()),
-                SdkConfigProvider.create(new OpenTelemetryConfigurationModel()))
+                SdkConfigProvider.create(DeclarativeConfigProperties.empty()))
             .build();
     cleanup.addCloseable(expectedSdk);
     AutoConfiguredOpenTelemetrySdkBuilder builder = spy(AutoConfiguredOpenTelemetrySdk.builder());

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

@@ -29,8 +29,8 @@
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
-import io.opentelemetry.sdk.extension.incubator.ExtendedOpenTelemetrySdk;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.OpenTelemetrySdkBuilderUtil;
+import io.opentelemetry.sdk.internal.all.ExtendedOpenTelemetrySdk;
+import io.opentelemetry.sdk.internal.all.OpenTelemetrySdkBuilderUtil;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
@@ -124,7 +124,7 @@ void configFile_Valid() {
     OpenTelemetrySdk openTelemetrySdk = autoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk();
     Resource resource = Resource.getDefault().toBuilder().put("service.name", "test").build();
     OpenTelemetrySdk expectedSdk =
-        OpenTelemetrySdkBuilderUtil.setSdkConfigProvider(
+        OpenTelemetrySdkBuilderUtil.setConfigProvider(
                 OpenTelemetrySdk.builder()
                     .setTracerProvider(
                         SdkTracerProvider.builder()

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

@@ -16,9 +16,9 @@
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.AutoConfigureListener;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
-import io.opentelemetry.sdk.extension.incubator.ExtendedOpenTelemetrySdk;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel;
+import io.opentelemetry.sdk.internal.all.ExtendedOpenTelemetrySdk;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import java.io.Closeable;
 import java.io.IOException;

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

@@ -6,10 +6,13 @@
 package io.opentelemetry.sdk.extension.incubator.fileconfig;
 
 import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.OpenTelemetrySdkBuilder;
-import io.opentelemetry.sdk.extension.incubator.ExtendedOpenTelemetrySdk;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import io.opentelemetry.sdk.internal.all.ExtendedOpenTelemetrySdk;
+import io.opentelemetry.sdk.internal.all.OpenTelemetrySdkBuilderUtil;
+import io.opentelemetry.sdk.internal.all.SdkConfigProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.Objects;
@@ -32,10 +35,12 @@ static OpenTelemetryConfigurationFactory getInstance() {
   @Override
   public ExtendedOpenTelemetrySdk create(
       OpenTelemetryConfigurationModel model, DeclarativeConfigContext context) {
-    SdkConfigProvider sdkConfigProvider =
-        SdkConfigProvider.create(model, context.getSpiHelper().getComponentLoader());
+    DeclarativeConfigProperties modelProperties =
+        DeclarativeConfiguration.toConfigProperties(
+            model, context.getSpiHelper().getComponentLoader());
+    SdkConfigProvider sdkConfigProvider = SdkConfigProvider.create(modelProperties);
     OpenTelemetrySdkBuilder builder =
-        OpenTelemetrySdkBuilderUtil.setSdkConfigProvider(
+        OpenTelemetrySdkBuilderUtil.setConfigProvider(
             OpenTelemetrySdk.builder(), sdkConfigProvider);
     String fileFormat = model.getFileFormat();
     if (fileFormat == null || !SUPPORTED_FILE_FORMATS.matcher(fileFormat).matches()) {

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

@@ -20,10 +20,10 @@
 import io.opentelemetry.internal.testing.slf4j.SuppressLogger;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
-import io.opentelemetry.sdk.extension.incubator.ExtendedOpenTelemetrySdk;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
+import io.opentelemetry.sdk.internal.all.ExtendedOpenTelemetrySdk;
 import io.opentelemetry.sdk.trace.samplers.ParentBasedSamplerBuilder;
 import java.io.ByteArrayInputStream;
 import java.io.File;

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

@@ -24,7 +24,6 @@
 import io.opentelemetry.internal.testing.CleanupExtension;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
-import io.opentelemetry.sdk.extension.incubator.ExtendedOpenTelemetrySdk;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AlwaysOnSamplerModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeNameValueModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchLogRecordProcessorModel;
@@ -53,6 +52,9 @@
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewSelectorModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel;
+import io.opentelemetry.sdk.internal.all.ExtendedOpenTelemetrySdk;
+import io.opentelemetry.sdk.internal.all.OpenTelemetrySdkBuilderUtil;
+import io.opentelemetry.sdk.internal.all.SdkConfigProvider;
 import io.opentelemetry.sdk.logs.LogLimits;
 import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.metrics.InstrumentSelector;
@@ -124,8 +126,9 @@ void create_Defaults() {
     OpenTelemetryConfigurationModel model =
         new OpenTelemetryConfigurationModel().withFileFormat("1.0-rc.1");
     OpenTelemetrySdk expectedSdk =
-        OpenTelemetrySdkBuilderUtil.setSdkConfigProvider(
-                OpenTelemetrySdk.builder(), SdkConfigProvider.create(model))
+        OpenTelemetrySdkBuilderUtil.setConfigProvider(
+                OpenTelemetrySdk.builder(),
+                SdkConfigProvider.create(DeclarativeConfiguration.toConfigProperties(model)))
             .build();
     cleanup.addCloseable(expectedSdk);
 
@@ -156,8 +159,9 @@ void create_Disabled() {
                                             new LogRecordExporterModel()
                                                 .withOtlpHttp(new OtlpHttpExporterModel()))))));
     OpenTelemetrySdk expectedSdk =
-        OpenTelemetrySdkBuilderUtil.setSdkConfigProvider(
-                OpenTelemetrySdk.builder(), SdkConfigProvider.create(model))
+        OpenTelemetrySdkBuilderUtil.setConfigProvider(
+                OpenTelemetrySdk.builder(),
+                SdkConfigProvider.create(DeclarativeConfiguration.toConfigProperties(model)))
             .build();
     cleanup.addCloseable(expectedSdk);
 
@@ -260,7 +264,7 @@ void create_Configured() throws NoSuchFieldException, IllegalAccessException {
                                         .withAttributeKeys(null)))));
 
     OpenTelemetrySdk expectedSdk =
-        OpenTelemetrySdkBuilderUtil.setSdkConfigProvider(
+        OpenTelemetrySdkBuilderUtil.setConfigProvider(
                 OpenTelemetrySdk.builder()
                     .setPropagators(
                         ContextPropagators.create(
@@ -314,7 +318,7 @@ void create_Configured() throws NoSuchFieldException, IllegalAccessException {
                                 InstrumentSelector.builder().setName("instrument-name").build(),
                                 View.builder().setName("stream-name").build())
                             .build()),
-                SdkConfigProvider.create(model))
+                SdkConfigProvider.create(DeclarativeConfiguration.toConfigProperties(model)))
             .build();
 
     cleanup.addCloseable(expectedSdk);

sdk/all/build.gradle.kts

@@ -17,6 +17,8 @@ dependencies {
   api(project(":sdk:metrics"))
   api(project(":sdk:logs"))
 
+  compileOnly(project(":api:incubator"))
+
   annotationProcessor("com.google.auto.value:auto-value")
 
   testAnnotationProcessor("com.google.auto.value:auto-value")