diff --git a/custom/build.gradle.kts b/custom/build.gradle.kts index 24f205f2..5fd8f17f 100644 --- a/custom/build.gradle.kts +++ b/custom/build.gradle.kts @@ -40,7 +40,7 @@ dependencies { compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api") 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") @@ -52,7 +52,7 @@ dependencies { testImplementation(project(":libs:core")) 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/HostIdResourceUtil.java b/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HostIdResourceUtil.java index d4e9ead2..eb953814 100644 --- a/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HostIdResourceUtil.java +++ b/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HostIdResourceUtil.java @@ -21,11 +21,11 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; +import io.opentelemetry.semconv.ContainerAttributes; +import io.opentelemetry.semconv.K8sAttributes; import io.opentelemetry.semconv.ServiceAttributes; import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes; -import io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes; import io.opentelemetry.semconv.incubating.HostIncubatingAttributes; -import io.opentelemetry.semconv.incubating.K8sIncubatingAttributes; import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes; public final class HostIdResourceUtil { @@ -35,7 +35,7 @@ public static Attributes createAttribute() { AttributesBuilder builder = Attributes.builder(); HostId hostId = ServerHostInfoReader.INSTANCE.getHostId(); - builder.put(ContainerIncubatingAttributes.CONTAINER_ID, hostId.getDockerContainerId()); + builder.put(ContainerAttributes.CONTAINER_ID, hostId.getDockerContainerId()); builder.put(ProcessIncubatingAttributes.PROCESS_PID, (long) hostId.getPid()); builder.put(AttributeKey.stringArrayKey("mac.addresses"), hostId.getMacAddresses()); @@ -49,9 +49,9 @@ public static Attributes createAttribute() { HostId.K8sMetadata k8sMetadata = hostId.getK8sMetadata(); if (k8sMetadata != null) { - builder.put(K8sIncubatingAttributes.K8S_POD_UID, k8sMetadata.getPodUid()); - builder.put(K8sIncubatingAttributes.K8S_NAMESPACE_NAME, k8sMetadata.getNamespace()); - builder.put(K8sIncubatingAttributes.K8S_POD_NAME, k8sMetadata.getPodName()); + builder.put(K8sAttributes.K8S_POD_UID, k8sMetadata.getPodUid()); + builder.put(K8sAttributes.K8S_NAMESPACE_NAME, k8sMetadata.getNamespace()); + builder.put(K8sAttributes.K8S_POD_NAME, k8sMetadata.getPodName()); } HostId.AwsMetadata awsMetadata = hostId.getAwsMetadata(); diff --git a/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HttpSettingsReaderDelegate.java b/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HttpSettingsReaderDelegate.java index b5640096..c87f79d2 100644 --- a/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HttpSettingsReaderDelegate.java +++ b/custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HttpSettingsReaderDelegate.java @@ -24,7 +24,7 @@ import com.solarwinds.joboe.logging.Logger; import com.solarwinds.joboe.logging.LoggerFactory; import com.solarwinds.joboe.sampling.Settings; -import io.opentelemetry.api.internal.InstrumentationUtil; +import io.opentelemetry.api.impl.InstrumentationUtil; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; 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..2c0e1971 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.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 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..339d4899 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.autoconfigure.declarativeconfig.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/HttpSettingsReaderDelegateTest.java b/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/HttpSettingsReaderDelegateTest.java index 11c38f16..0d50de16 100644 --- a/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/HttpSettingsReaderDelegateTest.java +++ b/custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/HttpSettingsReaderDelegateTest.java @@ -32,7 +32,7 @@ import com.solarwinds.joboe.config.InvalidConfigException; import com.solarwinds.joboe.config.ProxyConfig; import com.solarwinds.joboe.sampling.Settings; -import io.opentelemetry.api.internal.InstrumentationUtil; +import io.opentelemetry.api.impl.InstrumentationUtil; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; 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..e1763872 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,11 @@ 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.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel; +import java.util.Collections; import java.util.List; import java.util.function.Function; import org.junit.jupiter.api.Test; @@ -59,7 +60,9 @@ void verifyThatProfilingProcessorIsAddedWhenJdkVersionIsSupported() { .thenReturn(true); OpenTelemetryConfigurationModel openTelemetryConfigurationModel = - new OpenTelemetryConfigurationModel().withTracerProvider(new TracerProviderModel()); + new OpenTelemetryConfigurationModel() + .withTracerProvider( + new TracerProviderModel().withProcessors(Collections.emptyList())); doNothing() .when(declarativeConfigurationCustomizerMock) @@ -89,7 +92,9 @@ void verifyThatProfilingProcessorIsNotAddedWhenJdkVersionIsNotSupported() { .thenReturn(false); OpenTelemetryConfigurationModel openTelemetryConfigurationModel = - new OpenTelemetryConfigurationModel().withTracerProvider(new TracerProviderModel()); + new OpenTelemetryConfigurationModel() + .withTracerProvider( + new TracerProviderModel().withProcessors(Collections.emptyList())); doNothing() .when(declarativeConfigurationCustomizerMock) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 41dfe08d..ef7bfbc5 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -2,15 +2,15 @@ plugins { `java-platform` } -val otelAgentVersion = "2.27.0" -val otelSdkVersion = "1.61.0" +val otelAgentVersion = "2.29.0" +val otelSdkVersion = "1.63.0" val mockitoVersion = "5.2.0" val byteBuddyVersion = "1.18.8" val opentelemetryJavaagentAlpha = "$otelAgentVersion-alpha" val opentelemetryAlpha = "$otelSdkVersion-alpha" -val opentelemetrySemconv = "1.40.0" +val opentelemetrySemconv = "1.42.0" val opentelemetrySemconvAlpha = "$opentelemetrySemconv-alpha" val autoservice = "1.1.1" @@ -25,7 +25,7 @@ javaPlatform { } dependencies { - api(platform("io.netty:netty-bom:4.1.133.Final")) + api(platform("io.netty:netty-bom:4.1.135.Final")) constraints { api("org.mockito:mockito-core:$mockitoVersion") @@ -69,7 +69,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/core/src/main/java/com/solarwinds/joboe/core/util/ServerHostInfoReader.java b/libs/core/src/main/java/com/solarwinds/joboe/core/util/ServerHostInfoReader.java index 8ffc1439..eb42f255 100644 --- a/libs/core/src/main/java/com/solarwinds/joboe/core/util/ServerHostInfoReader.java +++ b/libs/core/src/main/java/com/solarwinds/joboe/core/util/ServerHostInfoReader.java @@ -21,7 +21,7 @@ import com.solarwinds.joboe.core.HostId; import com.solarwinds.joboe.logging.Logger; import com.solarwinds.joboe.logging.LoggerFactory; -import io.opentelemetry.api.internal.InstrumentationUtil; +import io.opentelemetry.api.impl.InstrumentationUtil; import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; diff --git a/libs/core/src/main/java/com/solarwinds/joboe/core/util/UamsClientIdReader.java b/libs/core/src/main/java/com/solarwinds/joboe/core/util/UamsClientIdReader.java index 6d725221..9a2a8d3d 100644 --- a/libs/core/src/main/java/com/solarwinds/joboe/core/util/UamsClientIdReader.java +++ b/libs/core/src/main/java/com/solarwinds/joboe/core/util/UamsClientIdReader.java @@ -18,7 +18,7 @@ import com.solarwinds.joboe.logging.Logger; import com.solarwinds.joboe.logging.LoggerFactory; -import io.opentelemetry.api.internal.InstrumentationUtil; +import io.opentelemetry.api.impl.InstrumentationUtil; import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; diff --git a/libs/shared/build.gradle.kts b/libs/shared/build.gradle.kts index 24f4f202..cb8126c6 100644 --- a/libs/shared/build.gradle.kts +++ b/libs/shared/build.gradle.kts @@ -53,7 +53,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")) @@ -62,7 +62,7 @@ dependencies { testImplementation("io.opentelemetry:opentelemetry-exporter-otlp") 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..98fe068d 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.autoconfigure.declarativeconfig.model.AttributeLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchLogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchSpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterPropertyModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LoggerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PeriodicMetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PropagatorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PushMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PushMetricExporterPropertyModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerPropertyModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterPropertyModel; +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 java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -79,7 +79,7 @@ public void customize(DeclarativeConfigurationCustomizer customizer) { LoggerProviderModel loggerProvider = configurationModel.getLoggerProvider(); if (meterProvider == null) { - meterProvider = new MeterProviderModel(); + meterProvider = new MeterProviderModel().withReaders(Collections.emptyList()); configurationModel.withMeterProvider(meterProvider); try { ConfigManager.setConfig(ConfigProperty.AGENT_EXPORT_METRICS_ENABLED, false); 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..8e80bb4a 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.autoconfigure.declarativeconfig.model.AttributeLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchLogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchSpanProcessorModel; +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; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LoggerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PeriodicMetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PropagatorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SimpleLogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SimpleSpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterPropertyModel; +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 java.util.Collections; import java.util.Map; import java.util.Optional; @@ -77,8 +77,8 @@ class SharedConfigCustomizerProviderTest { void testCustomize() { OpenTelemetryConfigurationModel openTelemetryConfigurationModel = new OpenTelemetryConfigurationModel() - .withTracerProvider(new TracerProviderModel()) - .withLoggerProvider(new LoggerProviderModel()) + .withTracerProvider(new TracerProviderModel().withProcessors(Collections.emptyList())) + .withLoggerProvider(new LoggerProviderModel().withProcessors(Collections.emptyList())) .withInstrumentationDevelopment( new ExperimentalInstrumentationModel() .withJava( @@ -145,7 +145,7 @@ void testCustomize() { void testCustomize1() { OpenTelemetryConfigurationModel openTelemetryConfigurationModel = new OpenTelemetryConfigurationModel() - .withTracerProvider(new TracerProviderModel()) + .withTracerProvider(new TracerProviderModel().withProcessors(Collections.emptyList())) .withInstrumentationDevelopment( new ExperimentalInstrumentationModel() .withJava( @@ -332,7 +332,7 @@ void customizeShouldNotSetTraceExporterWhenSimpleIsSpecified() { void testCustomizeSetsExperimentalStacktraceWhenNotSet() { OpenTelemetryConfigurationModel openTelemetryConfigurationModel = new OpenTelemetryConfigurationModel() - .withTracerProvider(new TracerProviderModel()) + .withTracerProvider(new TracerProviderModel().withProcessors(Collections.emptyList())) .withInstrumentationDevelopment( new ExperimentalInstrumentationModel() .withJava( @@ -409,7 +409,7 @@ void testCustomizeSetExperimentalStacktraceFilterWhenNotSet() { void testCustomize2() { OpenTelemetryConfigurationModel openTelemetryConfigurationModel = new OpenTelemetryConfigurationModel() - .withLoggerProvider(new LoggerProviderModel()) + .withLoggerProvider(new LoggerProviderModel().withProcessors(Collections.emptyList())) .withInstrumentationDevelopment( new ExperimentalInstrumentationModel() .withJava( @@ -540,7 +540,7 @@ void customizeShouldNotSetLogExporterWhenSimpleIsSpecified() { void UrlShouldNotChangeWhenNotApm() { OpenTelemetryConfigurationModel openTelemetryConfigurationModel = new OpenTelemetryConfigurationModel() - .withLoggerProvider(new LoggerProviderModel()) + .withLoggerProvider(new LoggerProviderModel().withProcessors(Collections.emptyList())) .withInstrumentationDevelopment( new ExperimentalInstrumentationModel() .withJava( @@ -581,7 +581,7 @@ void UrlShouldNotChangeWhenNotApm() { void UrlShouldNotChangeWhenNotApm2() { OpenTelemetryConfigurationModel openTelemetryConfigurationModel = new OpenTelemetryConfigurationModel() - .withLoggerProvider(new LoggerProviderModel()) + .withLoggerProvider(new LoggerProviderModel().withProcessors(Collections.emptyList())) .withInstrumentationDevelopment( new ExperimentalInstrumentationModel() .withJava( @@ -622,7 +622,7 @@ void UrlShouldNotChangeWhenNotApm2() { void tracesNotConfiguredWhenTracerProviderAbsent() { OpenTelemetryConfigurationModel openTelemetryConfigurationModel = new OpenTelemetryConfigurationModel() - .withLoggerProvider(new LoggerProviderModel()) + .withLoggerProvider(new LoggerProviderModel().withProcessors(Collections.emptyList())) .withInstrumentationDevelopment( new ExperimentalInstrumentationModel() .withJava( @@ -656,7 +656,10 @@ void customizeShouldNotOverrideSamplerWhenOneIsAlreadyConfigured() { OpenTelemetryConfigurationModel openTelemetryConfigurationModel = new OpenTelemetryConfigurationModel() - .withTracerProvider(new TracerProviderModel().withSampler(userSampler)) + .withTracerProvider( + new TracerProviderModel() + .withProcessors(Collections.emptyList()) + .withSampler(userSampler)) .withInstrumentationDevelopment( new ExperimentalInstrumentationModel() .withJava( @@ -689,7 +692,7 @@ void customizeShouldNotOverrideSamplerWhenOneIsAlreadyConfigured() { void logsNotConfiguredWhenLoggerProviderAbsent() { OpenTelemetryConfigurationModel openTelemetryConfigurationModel = new OpenTelemetryConfigurationModel() - .withTracerProvider(new TracerProviderModel()) + .withTracerProvider(new TracerProviderModel().withProcessors(Collections.emptyList())) .withInstrumentationDevelopment( new ExperimentalInstrumentationModel() .withJava( diff --git a/smoke-tests/src/test/java/com/solarwinds/containers/PetClinicRestContainer.java b/smoke-tests/src/test/java/com/solarwinds/containers/PetClinicRestContainer.java index bd5fd60f..e2841626 100644 --- a/smoke-tests/src/test/java/com/solarwinds/containers/PetClinicRestContainer.java +++ b/smoke-tests/src/test/java/com/solarwinds/containers/PetClinicRestContainer.java @@ -96,10 +96,8 @@ public GenericContainer build() { .withNetworkAliases("petclinic") .withLogConsumer(new Slf4jLogConsumer(logger)) .withExposedPorts(PETCLINIC_PORT) - .withFileSystemBind("./apm-config.json", "/app/apm-config.json") .withFileSystemBind("./sdk-config.yaml", "/app/sdk-config.yaml") - .withEnv("SW_APM_CONFIG_FILE", "/app/apm-config.json") - .withEnv("OTEL_EXPERIMENTAL_CONFIG_FILE", "/app/sdk-config.yaml") + .withEnv("OTEL_CONFIG_FILE", "/app/sdk-config.yaml") .withEnv("OTEL_JAVAAGENT_DEBUG", "true") .waitingFor(Wait.forHttp("/petclinic/actuator/health").withReadTimeout(Duration.ofMinutes(5)).forPort(PETCLINIC_PORT)) .withEnv("spring_profiles_active", "postgresql,spring-data-jpa")