diff --git a/custom/build.gradle.kts b/custom/build.gradle.kts index 24f205f2..c8cf911d 100644 --- a/custom/build.gradle.kts +++ b/custom/build.gradle.kts @@ -41,6 +41,7 @@ dependencies { compileOnly("io.opentelemetry:opentelemetry-api-incubator") compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator") + compileOnly("io.opentelemetry:opentelemetry-sdk-extension-declarative-config") compileOnly("io.opentelemetry:opentelemetry-exporter-otlp") compileOnly("com.google.code.gson:gson") @@ -53,6 +54,7 @@ dependencies { testImplementation("io.opentelemetry:opentelemetry-api-incubator") testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator") + testImplementation("io.opentelemetry:opentelemetry-sdk-extension-declarative-config") testImplementation("io.opentelemetry:opentelemetry-exporter-otlp") } diff --git a/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/CustomConfigCustomizerProvider.java b/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/CustomConfigCustomizerProvider.java index f40b091a..33960613 100644 --- a/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/CustomConfigCustomizerProvider.java +++ b/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/CustomConfigCustomizerProvider.java @@ -18,15 +18,15 @@ import com.google.auto.service.AutoService; import com.solarwinds.joboe.config.JavaRuntimeVersionChecker; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectionModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectorPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ResourceModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizerProvider; +import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalResourceDetectionModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalResourceDetectorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalResourceDetectorPropertyModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.ResourceModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorPropertyModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/DeclarativeLoaderTest.java b/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/DeclarativeLoaderTest.java index ceb61a3a..c27a2707 100644 --- a/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/DeclarativeLoaderTest.java +++ b/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/DeclarativeLoaderTest.java @@ -24,8 +24,8 @@ import com.solarwinds.joboe.config.ConfigProperty; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel; import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/ProfilingSettingsParserTest.java b/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/ProfilingSettingsParserTest.java index 381ac213..d5d56a22 100644 --- a/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/ProfilingSettingsParserTest.java +++ b/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/ProfilingSettingsParserTest.java @@ -22,7 +22,7 @@ import com.solarwinds.joboe.config.InvalidConfigException; import com.solarwinds.joboe.core.profiler.ProfilerSetting; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; import java.io.IOException; import java.io.InputStream; import java.util.Collections; diff --git a/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/CustomConfigCustomizerProviderTest.java b/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/CustomConfigCustomizerProviderTest.java index 450642c1..c226d9aa 100644 --- a/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/CustomConfigCustomizerProviderTest.java +++ b/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/CustomConfigCustomizerProviderTest.java @@ -24,10 +24,10 @@ import static org.mockito.Mockito.mockStatic; import com.solarwinds.joboe.config.JavaRuntimeVersionChecker; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer; -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.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer; +import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel; import java.util.List; import java.util.function.Function; import org.junit.jupiter.api.Test; diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 41dfe08d..6091e248 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } val otelAgentVersion = "2.27.0" -val otelSdkVersion = "1.61.0" +val otelSdkVersion = "1.62.0" val mockitoVersion = "5.2.0" val byteBuddyVersion = "1.18.8" @@ -70,6 +70,7 @@ dependencies { api("io.opentelemetry:opentelemetry-api-incubator:$opentelemetryAlpha") api("io.opentelemetry:opentelemetry-exporter-otlp:$otelSdkVersion") api("io.opentelemetry:opentelemetry-sdk-extension-incubator:$opentelemetryAlpha") + api("io.opentelemetry:opentelemetry-sdk-extension-declarative-config:$opentelemetryAlpha") api("org.junit.jupiter:junit-jupiter-params:$junit5") api("dev.cel:cel:0.13.0") diff --git a/libs/shared/build.gradle.kts b/libs/shared/build.gradle.kts index 24f4f202..b32c10f5 100644 --- a/libs/shared/build.gradle.kts +++ b/libs/shared/build.gradle.kts @@ -54,6 +54,7 @@ dependencies { compileOnly("io.opentelemetry:opentelemetry-api-incubator") compileOnly("io.opentelemetry:opentelemetry-exporter-otlp") compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator") + compileOnly("io.opentelemetry:opentelemetry-sdk-extension-declarative-config") testImplementation("org.json:json") testImplementation(project(":libs:config")) @@ -63,6 +64,7 @@ dependencies { testImplementation("io.opentelemetry:opentelemetry-api-incubator") testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator") + testImplementation("io.opentelemetry:opentelemetry-sdk-extension-declarative-config") } val otelAgentVersion: String by rootProject.extra diff --git a/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProvider.java b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProvider.java index 4ca2c356..aa4b2a01 100644 --- a/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProvider.java +++ b/libs/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProvider.java @@ -26,30 +26,30 @@ import com.solarwinds.joboe.config.ServiceKeyUtils; import com.solarwinds.opentelemetry.extensions.config.parser.yaml.ProxyParser; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchLogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchSpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LoggerProviderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MeterProviderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PeriodicMetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PropagatorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizerProvider; +import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchLogRecordProcessorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchSpanProcessorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordExporterModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordExporterPropertyModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordProcessorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.LoggerProviderModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.MeterProviderModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.MetricReaderModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.PeriodicMetricReaderModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.PropagatorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.PushMetricExporterModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.PushMetricExporterPropertyModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SamplerModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SamplerPropertyModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterPropertyModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorPropertyModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParserTest.java index 7adb3e45..c0079692 100644 --- a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParserTest.java +++ b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/LogSettingParserTest.java @@ -22,7 +22,7 @@ import com.solarwinds.joboe.logging.LogSetting; import com.solarwinds.joboe.logging.Logger; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; import java.io.IOException; import java.io.InputStream; import org.junit.jupiter.api.BeforeAll; diff --git a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlQueryMaxLengthParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlQueryMaxLengthParserTest.java index 739a014a..0a62ce42 100644 --- a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlQueryMaxLengthParserTest.java +++ b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlQueryMaxLengthParserTest.java @@ -22,7 +22,7 @@ import com.solarwinds.joboe.config.InvalidConfigException; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParserTest.java index 0a92f774..1090dac9 100644 --- a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParserTest.java +++ b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/SqlTagDatabasesParserTest.java @@ -20,7 +20,7 @@ import com.solarwinds.joboe.config.InvalidConfigException; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; import java.io.IOException; import java.io.InputStream; import java.util.Collections; diff --git a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParserTest.java index 5ef0811b..c8d0d31a 100644 --- a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParserTest.java +++ b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/StacktraceFilterParserTest.java @@ -20,7 +20,7 @@ import com.solarwinds.joboe.config.InvalidConfigException; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; import java.io.IOException; import java.io.InputStream; import java.util.Collections; diff --git a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParserTest.java index 00b7614d..cfcbd1c6 100644 --- a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParserTest.java +++ b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TracingModeParserTest.java @@ -21,7 +21,7 @@ import com.solarwinds.joboe.config.InvalidConfigException; import com.solarwinds.joboe.sampling.TracingMode; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; import java.io.IOException; import java.io.InputStream; import org.junit.jupiter.api.BeforeAll; diff --git a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParserTest.java index dae4313b..eb77d9d5 100644 --- a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParserTest.java +++ b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionNamingSchemesParserTest.java @@ -21,7 +21,7 @@ import com.solarwinds.joboe.config.InvalidConfigException; import com.solarwinds.opentelemetry.extensions.TransactionNamingScheme; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; import java.io.IOException; import java.io.InputStream; import java.util.Collections; diff --git a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParserTest.java index b7284d47..4e65f307 100644 --- a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParserTest.java +++ b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TransactionSettingsConfigParserTest.java @@ -23,7 +23,7 @@ import com.solarwinds.joboe.config.InvalidConfigException; import com.solarwinds.joboe.sampling.TraceConfigs; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; import java.io.IOException; import java.io.InputStream; import java.util.stream.Stream; diff --git a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TriggerTraceParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TriggerTraceParserTest.java index d95de3a8..6bbbc214 100644 --- a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TriggerTraceParserTest.java +++ b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/TriggerTraceParserTest.java @@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; import java.io.IOException; import java.io.InputStream; import org.junit.jupiter.api.BeforeAll; diff --git a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParserTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParserTest.java index e3d1e2e5..0626e8f5 100644 --- a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParserTest.java +++ b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/parser/yaml/UrlSampleRateConfigParserTest.java @@ -23,7 +23,7 @@ import com.solarwinds.joboe.config.InvalidConfigException; import com.solarwinds.joboe.sampling.TraceConfigs; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; import java.io.IOException; import java.io.InputStream; import java.util.stream.Stream; diff --git a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProviderTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProviderTest.java index f01a314e..b1eaa2ec 100644 --- a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProviderTest.java +++ b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/provider/SharedConfigCustomizerProviderTest.java @@ -25,30 +25,30 @@ import com.solarwinds.joboe.config.ConfigManager; import com.solarwinds.joboe.config.ConfigProperty; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchLogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchSpanProcessorModel; -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.LogRecordExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LoggerProviderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MeterProviderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PeriodicMetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PropagatorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleLogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleSpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer; +import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchLogRecordProcessorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchSpanProcessorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalInstrumentationModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalLanguageSpecificInstrumentationModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordExporterModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordExporterPropertyModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordProcessorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.LoggerProviderModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.MeterProviderModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.MetricReaderModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.PeriodicMetricReaderModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.PropagatorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SamplerModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SimpleLogRecordProcessorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SimpleSpanProcessorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterPropertyModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorPropertyModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel; import java.util.Collections; import java.util.Map; import java.util.Optional;