From a21244c7a4004a875fac9df6589a8f17a03057e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 May 2026 19:12:20 +0000 Subject: [PATCH 1/3] Bump otelSdkVersion from 1.61.0 to 1.62.0 Bumps `otelSdkVersion` from 1.61.0 to 1.62.0. Updates `io.opentelemetry:opentelemetry-api` from 1.61.0 to 1.62.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.61.0...v1.62.0) Updates `io.opentelemetry:opentelemetry-sdk-extension-autoconfigure` from 1.61.0 to 1.62.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.61.0...v1.62.0) Updates `io.opentelemetry:opentelemetry-sdk-testing` from 1.61.0 to 1.62.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.61.0...v1.62.0) Updates `io.opentelemetry:opentelemetry-sdk` from 1.61.0 to 1.62.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.61.0...v1.62.0) Updates `io.opentelemetry:opentelemetry-exporter-otlp` from 1.61.0 to 1.62.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.61.0...v1.62.0) --- updated-dependencies: - dependency-name: io.opentelemetry:opentelemetry-api dependency-version: 1.62.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry:opentelemetry-exporter-otlp dependency-version: 1.62.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry:opentelemetry-sdk dependency-version: 1.62.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry:opentelemetry-sdk-extension-autoconfigure dependency-version: 1.62.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry:opentelemetry-sdk-testing dependency-version: 1.62.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 41dfe08d..c94ccfe0 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" From 091dc01aa89fe29d1d0fee0fe0a05a09e8cea708 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 21 May 2026 13:40:42 +0000 Subject: [PATCH 2/3] Plan: fix OTel 1.62.0 breaking change for declarative config API Agent-Logs-Url: https://github.com/solarwinds/apm-java/sessions/608c829d-3e74-4fc1-9300-13687a80a836 Co-authored-by: cleverchuk <15526124+cleverchuk@users.noreply.github.com> --- .../DeclarativeConfiguration.class | Bin 0 -> 14361 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfiguration.class diff --git a/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfiguration.class b/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfiguration.class new file mode 100644 index 0000000000000000000000000000000000000000..2daee4291de8c0809979911af1d9626e1011fc8c GIT binary patch literal 14361 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 Vhwc22M=E>e>s0p_*uEc&{s89{%BKJT literal 0 HcmV?d00001 From d7ac215621809583d4a4bc544c6feb2548a65ad5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 21 May 2026 13:47:52 +0000 Subject: [PATCH 3/3] Fix OTel 1.62.0 breaking change: migrate to opentelemetry-sdk-extension-declarative-config Agent-Logs-Url: https://github.com/solarwinds/apm-java/sessions/608c829d-3e74-4fc1-9300-13687a80a836 Co-authored-by: cleverchuk <15526124+cleverchuk@users.noreply.github.com> --- custom/build.gradle.kts | 2 + .../CustomConfigCustomizerProvider.java | 18 +++---- .../config/DeclarativeLoaderTest.java | 4 +- .../yaml/ProfilingSettingsParserTest.java | 2 +- .../CustomConfigCustomizerProviderTest.java | 8 +-- dependencyManagement/build.gradle.kts | 1 + .../DeclarativeConfiguration.class | Bin 14361 -> 0 bytes libs/shared/build.gradle.kts | 2 + .../SharedConfigCustomizerProvider.java | 48 +++++++++--------- .../parser/yaml/LogSettingParserTest.java | 2 +- .../yaml/SqlQueryMaxLengthParserTest.java | 2 +- .../yaml/SqlTagDatabasesParserTest.java | 2 +- .../yaml/StacktraceFilterParserTest.java | 2 +- .../parser/yaml/TracingModeParserTest.java | 2 +- .../TransactionNamingSchemesParserTest.java | 2 +- .../TransactionSettingsConfigParserTest.java | 2 +- .../parser/yaml/TriggerTraceParserTest.java | 2 +- .../yaml/UrlSampleRateConfigParserTest.java | 2 +- .../SharedConfigCustomizerProviderTest.java | 48 +++++++++--------- 19 files changed, 78 insertions(+), 73 deletions(-) delete mode 100644 io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfiguration.class 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 c94ccfe0..6091e248 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -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/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfiguration.class b/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfiguration.class deleted file mode 100644 index 2daee4291de8c0809979911af1d9626e1011fc8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14361 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 Vhwc22M=E>e>s0p_*uEc&{s89{%BKJT 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;