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 8f3de154..f5b7eba0 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 @@ -20,13 +20,13 @@ import com.solarwinds.joboe.config.JavaRuntimeVersionChecker; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizerProvider; -import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectionModel; -import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectorModel; -import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectorPropertyModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ResourceModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorPropertyModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalResourceDetectionModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalResourceDetectorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalResourceDetectorPropertyModel; 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 969629c0..c3ecb4f1 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 @@ -27,10 +27,10 @@ import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.DistributionModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.DistributionPropertyModel; -import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalInstrumentationModel; -import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLanguageSpecificInstrumentationModel; -import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLanguageSpecificInstrumentationPropertyModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalInstrumentationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalLanguageSpecificInstrumentationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalLanguageSpecificInstrumentationPropertyModel; import java.util.function.Function; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 7735a47b..c2206e76 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -2,8 +2,8 @@ plugins { `java-platform` } -val otelAgentVersion = "2.29.0" -val otelSdkVersion = "1.63.0" +val otelAgentVersion = "2.30.0" +val otelSdkVersion = "1.64.0" val mockitoVersion = "5.2.0" val byteBuddyVersion = "1.18.8" 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 55f4b68c..2ab87ce0 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 @@ -142,7 +142,7 @@ private void addProcessors(TracerProviderModel model) { Map additionalProperties = spanProcessorPropertyModel.getAdditionalProperties(); if (!additionalProperties.containsKey("filter")) { - spanProcessorModel.setAdditionalProperty( + spanProcessorModel.withAdditionalProperty( experimentalStacktrace, spanProcessorPropertyModel.withAdditionalProperty( "filter", SPAN_STACKTRACE_FILTER_CLASS)); diff --git a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/SolarwindsConfigResolverTest.java b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/SolarwindsConfigResolverTest.java index f447237c..9cc83506 100644 --- a/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/SolarwindsConfigResolverTest.java +++ b/libs/shared/src/test/java/com/solarwinds/opentelemetry/extensions/config/SolarwindsConfigResolverTest.java @@ -25,10 +25,10 @@ import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.DistributionModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.DistributionPropertyModel; -import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalInstrumentationModel; -import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLanguageSpecificInstrumentationModel; -import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLanguageSpecificInstrumentationPropertyModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalInstrumentationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalLanguageSpecificInstrumentationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalLanguageSpecificInstrumentationPropertyModel; import org.junit.jupiter.api.Test; class SolarwindsConfigResolverTest { 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 c57dd8f8..6a203f2b 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 @@ -31,9 +31,6 @@ import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchSpanProcessorModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.DistributionModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.DistributionPropertyModel; -import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalInstrumentationModel; -import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLanguageSpecificInstrumentationModel; -import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLanguageSpecificInstrumentationPropertyModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterPropertyModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordProcessorModel; @@ -51,6 +48,9 @@ import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorPropertyModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalInstrumentationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalLanguageSpecificInstrumentationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.internal.ExperimentalLanguageSpecificInstrumentationPropertyModel; import java.util.Collections; import java.util.Map; import java.util.Optional; diff --git a/sdk-config.yaml b/sdk-config.yaml index 0eab2a17..ffcf4f49 100644 --- a/sdk-config.yaml +++ b/sdk-config.yaml @@ -6,7 +6,7 @@ # vars defined in https://opentelemetry.io/docs/specs/otel/configuration/sdk-environment-variables/. # The file format version. -file_format: "1.0" +file_format: "1.1" # Configure if the SDK is disabled or not. This setting is optional, the default value when not provided is for the SDK to be enabled disabled: false diff --git a/smoke-tests/sdk-config.yaml b/smoke-tests/sdk-config.yaml index dbd0d769..6effcba5 100644 --- a/smoke-tests/sdk-config.yaml +++ b/smoke-tests/sdk-config.yaml @@ -6,7 +6,7 @@ # vars defined in https://opentelemetry.io/docs/specs/otel/configuration/sdk-environment-variables/. # The file format version. -file_format: "0.4" +file_format: "1.1" # Configure if the SDK is disabled or not. This is not required to be provided to ensure the SDK isn't disabled, the default value when this is not provided is for the SDK to be enabled. disabled: false