diff --git a/api/incubator/src/testConvertToModel/java/io/opentelemetry/api/incubator/InstrumentationConfigUtilTest.java b/api/incubator/src/testConvertToModel/java/io/opentelemetry/api/incubator/InstrumentationConfigUtilTest.java index f55464729b4..44e2d9f0a24 100644 --- a/api/incubator/src/testConvertToModel/java/io/opentelemetry/api/incubator/InstrumentationConfigUtilTest.java +++ b/api/incubator/src/testConvertToModel/java/io/opentelemetry/api/incubator/InstrumentationConfigUtilTest.java @@ -15,10 +15,10 @@ import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.api.incubator.config.InstrumentationConfigUtil; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; -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.OpenTelemetryConfigurationModel; +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.internal.SdkConfigProvider; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigUtil.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigUtil.java index 72599856c57..a15c0bb171c 100644 --- a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigUtil.java +++ b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigUtil.java @@ -12,8 +12,8 @@ import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigResult; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationProvider; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/TestDeclarativeConfigurationProvider.java b/sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/TestDeclarativeConfigurationProvider.java index a98f3ca3556..2864c2ff080 100644 --- a/sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/TestDeclarativeConfigurationProvider.java +++ b/sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/TestDeclarativeConfigurationProvider.java @@ -7,7 +7,7 @@ import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationProvider; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; diff --git a/sdk-extensions/declarative-config/build.gradle.kts b/sdk-extensions/declarative-config/build.gradle.kts index 2765bdd3b2c..ba5f3b18494 100644 --- a/sdk-extensions/declarative-config/build.gradle.kts +++ b/sdk-extensions/declarative-config/build.gradle.kts @@ -85,7 +85,7 @@ val unzipConfigurationSchema by tasks.registering(Sync::class) { jsonSchema2Pojo { sourceFiles = setOf(file("$buildDirectory/configuration/opentelemetry_configuration.json")) targetDirectory = file("$buildDirectory/generated/sources/js2p/java/main") - targetPackage = "io.opentelemetry.sdk.declarativeconfig.internal.model" + targetPackage = "io.opentelemetry.sdk.autoconfigure.declarativeconfig.model" // Clear old source files to avoid contaminated source dir when updating removeOldOutput = true @@ -148,7 +148,7 @@ val deleteJs2pTmp by tasks.registering(Delete::class) { } // Copies EnvironmentResource.java from the autoconfigure module into a generated source set so -// that the incubator can use the exact same source without taking a runtime dependency on +// that declarative config can use the exact same source without taking a runtime dependency on // autoconfigure and without the risk of divergence from manual syncing. val generatedResourceConfigDir = layout.buildDirectory.dir("generated/sources/resource-configuration/java/main") @@ -180,10 +180,10 @@ val buildGraalVmReflectionJson = tasks.register("buildGraalVmReflectionJson") { val buildDir = buildDirectory val targetFile = File( buildDir, - "resources/main/META-INF/native-image/io.opentelemetry/io.opentelemetry.sdk.extension.incubator/reflect-config.json" + "resources/main/META-INF/native-image/io.opentelemetry/io.opentelemetry.sdk.autoconfigure.declarativeconfig/reflect-config.json" ) val sourcePackage = - "io.opentelemetry.sdk.declarativeconfig.internal.model" + "io.opentelemetry.sdk.autoconfigure.declarativeconfig.model" val sourcePackagePath = sourcePackage.replace(".", "/") val classesDir = File( @@ -241,7 +241,7 @@ tasks.getByName("compileTestJava").dependsOn(buildGraalVmReflectionJson) // Exclude jsonschema2pojo generated sources from checkstyle tasks.named("checkstyleMain") { dependsOn(buildGraalVmReflectionJson) - exclude("**/declarativeconfig/internal/model/**") + exclude("**/declarativeconfig/model/**") } tasks { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AggregationFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AggregationFactory.java index e9327dae63c..907ddbe4dd3 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AggregationFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AggregationFactory.java @@ -6,9 +6,9 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AggregationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.Base2ExponentialBucketHistogramAggregationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExplicitBucketHistogramAggregationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AggregationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.Base2ExponentialBucketHistogramAggregationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExplicitBucketHistogramAggregationModel; import io.opentelemetry.sdk.metrics.Aggregation; import io.opentelemetry.sdk.metrics.Base2ExponentialHistogramOptions; import io.opentelemetry.sdk.metrics.ExplicitBucketHistogramOptions; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactory.java index f3280e4640d..27fee4f3c5a 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactory.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeNameValueModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeNameValueModel; import java.util.List; import javax.annotation.Nullable; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/CardinalityLimitsFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/CardinalityLimitsFactory.java index 2cf3116631f..6ebe53c3ef8 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/CardinalityLimitsFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/CardinalityLimitsFactory.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.CardinalityLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.CardinalityLimitsModel; import io.opentelemetry.sdk.metrics.export.CardinalityLimitSelector; import io.opentelemetry.sdk.metrics.internal.state.MetricStorage; import javax.annotation.Nullable; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactory.java index 1cedf988f5f..7cb47abdc07 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactory.java @@ -14,12 +14,12 @@ import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.context.Context; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableRuleBasedSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableRuleBasedSamplerRuleModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalSpanParent; import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableRuleBasedSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalSpanParent; import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableRuleBasedSamplerBuilder; import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableSampler; import io.opentelemetry.sdk.extension.incubator.trace.samplers.SamplingPredicate; @@ -191,7 +191,7 @@ public String toString() { } private static SpanKind toSpanKind( - io.opentelemetry.sdk.declarativeconfig.internal.model.SpanKind spanKind) { + io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanKind spanKind) { switch (spanKind) { case INTERNAL: return SpanKind.INTERNAL; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableSamplerFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableSamplerFactory.java index 31cce54e59a..d215b88285e 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableSamplerFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableSamplerFactory.java @@ -5,9 +5,9 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableParentThresholdSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableProbabilitySamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableParentThresholdSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableProbabilitySamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableSamplerModel; import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableSampler; final class ComposableSamplerFactory diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigResult.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigResult.java index bff44c98a73..cdfb8623b61 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigResult.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigResult.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk; import io.opentelemetry.sdk.resources.Resource; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfiguration.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfiguration.java index 9628f238176..63503d8ba3d 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfiguration.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfiguration.java @@ -13,11 +13,11 @@ import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.common.ComponentLoader; import io.opentelemetry.sdk.OpenTelemetrySdk; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerModel; import io.opentelemetry.sdk.autoconfigure.spi.Ordered; import io.opentelemetry.sdk.autoconfigure.spi.internal.AutoConfigureListener; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SamplerModel; import io.opentelemetry.sdk.trace.samplers.Sampler; import java.io.Closeable; import java.io.IOException; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationBuilder.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationBuilder.java index 8c6b85890df..e9c762be85b 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationBuilder.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationBuilder.java @@ -7,7 +7,7 @@ import io.opentelemetry.api.incubator.config.DeclarativeConfigException; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; import io.opentelemetry.sdk.logs.export.LogRecordExporter; import io.opentelemetry.sdk.metrics.export.MetricExporter; import io.opentelemetry.sdk.trace.export.SpanExporter; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationCustomizer.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationCustomizer.java index 80303636e23..827ac0f884a 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationCustomizer.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationCustomizer.java @@ -6,7 +6,7 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; import io.opentelemetry.sdk.logs.export.LogRecordExporter; import io.opentelemetry.sdk.metrics.export.MetricExporter; import io.opentelemetry.sdk.trace.export.SpanExporter; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationProvider.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationProvider.java index 00c44a7efd2..f8915f669fa 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationProvider.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationProvider.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; import javax.annotation.Nullable; /** A service provider interface (SPI) for providing a declarative configuration model. */ diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactory.java index 6d17684a6f9..dcce34aea89 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactory.java @@ -6,7 +6,7 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.declarativeconfig.internal.model.MeterProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel; import io.opentelemetry.sdk.metrics.ExemplarFilter; final class ExemplarFilterFactory diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/IncludeExcludeFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/IncludeExcludeFactory.java index 5c0f9418133..0e2742c0bfb 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/IncludeExcludeFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/IncludeExcludeFactory.java @@ -6,8 +6,8 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.IncludeExcludeModel; import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; -import io.opentelemetry.sdk.declarativeconfig.internal.model.IncludeExcludeModel; import java.util.List; import java.util.function.Predicate; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/InstrumentSelectorFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/InstrumentSelectorFactory.java index 65ec3e6539a..b82bd301f89 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/InstrumentSelectorFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/InstrumentSelectorFactory.java @@ -6,7 +6,7 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewSelectorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewSelectorModel; import io.opentelemetry.sdk.metrics.InstrumentSelector; import io.opentelemetry.sdk.metrics.InstrumentSelectorBuilder; import io.opentelemetry.sdk.metrics.InstrumentType; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogLimitsFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogLimitsFactory.java index d6d53cb7147..8aa610d66ca 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogLimitsFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogLimitsFactory.java @@ -5,8 +5,8 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordLimitsModel; import io.opentelemetry.sdk.logs.LogLimits; import io.opentelemetry.sdk.logs.LogLimitsBuilder; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordExporterFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordExporterFactory.java index 355f6772041..781f950663e 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordExporterFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordExporterFactory.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterModel; import io.opentelemetry.sdk.logs.export.LogRecordExporter; final class LogRecordExporterFactory implements Factory { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordLimitsAndAttributeLimits.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordLimitsAndAttributeLimits.java index 0b9a834123b..5ffff22e45b 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordLimitsAndAttributeLimits.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordLimitsAndAttributeLimits.java @@ -6,8 +6,8 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; import com.google.auto.value.AutoValue; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordLimitsModel; import javax.annotation.Nullable; @AutoValue diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordProcessorFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordProcessorFactory.java index 877219e39d0..32952123100 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordProcessorFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordProcessorFactory.java @@ -5,10 +5,10 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchLogRecordProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SimpleLogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchLogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SimpleLogRecordProcessorModel; import io.opentelemetry.sdk.logs.LogRecordProcessor; import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor; import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessorBuilder; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderAndAttributeLimits.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderAndAttributeLimits.java index 3e18de2d807..143bb916c4a 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderAndAttributeLimits.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderAndAttributeLimits.java @@ -6,8 +6,8 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; import com.google.auto.value.AutoValue; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LoggerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LoggerProviderModel; import javax.annotation.Nullable; @AutoValue diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactory.java index 2e2d10c47ac..20c1882c9ee 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactory.java @@ -8,14 +8,14 @@ import static io.opentelemetry.sdk.autoconfigure.declarativeconfig.FileConfigUtil.requireNonNull; import io.opentelemetry.api.logs.Severity; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLoggerConfigModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLoggerConfiguratorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLoggerMatcherAndConfigModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LoggerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel.SeverityNumber; import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalLoggerConfigModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalLoggerConfiguratorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalLoggerMatcherAndConfigModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LoggerProviderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel.SeverityNumber; import io.opentelemetry.sdk.logs.LogLimits; import io.opentelemetry.sdk.logs.SdkLoggerProvider; import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactory.java index b176f1556bc..1051398e89c 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactory.java @@ -7,16 +7,16 @@ import static io.opentelemetry.sdk.autoconfigure.declarativeconfig.FileConfigUtil.requireNonNull; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalMeterConfigModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalMeterConfiguratorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalMeterMatcherAndConfigModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewSelectorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewStreamModel; import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalMeterConfigModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalMeterConfiguratorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalMeterMatcherAndConfigModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.MeterProviderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.MetricReaderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewSelectorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewStreamModel; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder; import io.opentelemetry.sdk.metrics.export.CardinalityLimitSelector; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricExporterFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricExporterFactory.java index 2946590b045..2bd715710a7 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricExporterFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricExporterFactory.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PushMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PushMetricExporterModel; import io.opentelemetry.sdk.metrics.export.MetricExporter; final class MetricExporterFactory implements Factory { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricReaderFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricReaderFactory.java index c3acd42351b..b2a6ec14f5b 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricReaderFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricReaderFactory.java @@ -8,11 +8,11 @@ import static io.opentelemetry.sdk.autoconfigure.declarativeconfig.FileConfigUtil.requireNonNull; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.declarativeconfig.internal.model.MetricReaderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PeriodicMetricReaderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PullMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PullMetricReaderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PushMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PeriodicMetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PullMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PullMetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PushMetricExporterModel; import io.opentelemetry.sdk.metrics.export.CardinalityLimitSelector; import io.opentelemetry.sdk.metrics.export.MetricExporter; import io.opentelemetry.sdk.metrics.export.MetricReader; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/OpenTelemetryConfigurationFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/OpenTelemetryConfigurationFactory.java index 11d0e226e9d..f5be20703a1 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/OpenTelemetryConfigurationFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/OpenTelemetryConfigurationFactory.java @@ -9,10 +9,10 @@ import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.OpenTelemetrySdkBuilder; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LoggerProviderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.MeterProviderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LoggerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel; import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk; import io.opentelemetry.sdk.internal.OpenTelemetrySdkBuilderUtil; import io.opentelemetry.sdk.internal.SdkConfigProvider; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/PropagatorFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/PropagatorFactory.java index 483cf6518c9..f2de7b59508 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/PropagatorFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/PropagatorFactory.java @@ -8,8 +8,8 @@ import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.context.propagation.ContextPropagators; import io.opentelemetry.context.propagation.TextMapPropagator; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PropagatorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TextMapPropagatorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PropagatorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TextMapPropagatorModel; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ResourceDetectorFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ResourceDetectorFactory.java index e797ff7747d..3f133b5b3c8 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ResourceDetectorFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ResourceDetectorFactory.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalResourceDetectorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectorModel; import io.opentelemetry.sdk.resources.Resource; final class ResourceDetectorFactory diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ResourceFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ResourceFactory.java index ebefd19a856..f1d1783aa03 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ResourceFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ResourceFactory.java @@ -9,12 +9,12 @@ import static io.opentelemetry.sdk.autoconfigure.declarativeconfig.EnvironmentResource.createEnvironmentResource; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeNameValueModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectionModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.IncludeExcludeModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ResourceModel; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeNameValueModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalResourceDetectionModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalResourceDetectorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.IncludeExcludeModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ResourceModel; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.resources.ResourceBuilder; import java.util.Collections; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SamplerFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SamplerFactory.java index 0d9910f2c33..5023f70ca87 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SamplerFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SamplerFactory.java @@ -5,10 +5,10 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalProbabilitySamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ParentBasedSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TraceIdRatioBasedSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalProbabilitySamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ParentBasedSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TraceIdRatioBasedSamplerModel; import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableSampler; import io.opentelemetry.sdk.extension.incubator.trace.samplers.CompositeSampler; import io.opentelemetry.sdk.trace.samplers.ParentBasedSamplerBuilder; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanExporterFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanExporterFactory.java index 4892465df36..c1e6c721186 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanExporterFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanExporterFactory.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterModel; import io.opentelemetry.sdk.trace.export.SpanExporter; final class SpanExporterFactory implements Factory { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanLimitsAndAttributeLimits.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanLimitsAndAttributeLimits.java index d8b50268e99..865bb2e54a8 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanLimitsAndAttributeLimits.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanLimitsAndAttributeLimits.java @@ -6,8 +6,8 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; import com.google.auto.value.AutoValue; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanLimitsModel; import javax.annotation.Nullable; @AutoValue diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanLimitsFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanLimitsFactory.java index fb2ea4a2016..38050eaf6b0 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanLimitsFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanLimitsFactory.java @@ -5,8 +5,8 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanLimitsModel; import io.opentelemetry.sdk.trace.SpanLimits; import io.opentelemetry.sdk.trace.SpanLimitsBuilder; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanProcessorFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanProcessorFactory.java index 97dcfc108b1..aeb1ba12103 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanProcessorFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanProcessorFactory.java @@ -5,10 +5,10 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchSpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SimpleSpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchSpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SimpleSpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel; import io.opentelemetry.sdk.trace.SpanProcessor; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; import io.opentelemetry.sdk.trace.export.BatchSpanProcessorBuilder; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TextMapPropagatorFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TextMapPropagatorFactory.java index 39d4129f5a7..e580993e6f4 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TextMapPropagatorFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TextMapPropagatorFactory.java @@ -8,7 +8,7 @@ import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator; import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator; import io.opentelemetry.context.propagation.TextMapPropagator; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TextMapPropagatorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TextMapPropagatorModel; final class TextMapPropagatorFactory implements Factory { diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TracerProviderAndAttributeLimits.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TracerProviderAndAttributeLimits.java index 01bed7df352..9bac7952176 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TracerProviderAndAttributeLimits.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TracerProviderAndAttributeLimits.java @@ -6,8 +6,8 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; import com.google.auto.value.AutoValue; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel; import javax.annotation.Nullable; @AutoValue diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TracerProviderFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TracerProviderFactory.java index 396227f7d55..b960e0d48bd 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TracerProviderFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TracerProviderFactory.java @@ -7,13 +7,13 @@ import static io.opentelemetry.sdk.autoconfigure.declarativeconfig.FileConfigUtil.requireNonNull; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalTracerConfigModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalTracerConfiguratorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalTracerMatcherAndConfigModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel; import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalTracerConfigModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalTracerConfiguratorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalTracerMatcherAndConfigModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder; import io.opentelemetry.sdk.trace.SpanLimits; diff --git a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ViewFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ViewFactory.java index f62b89d039e..32185c1990a 100644 --- a/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ViewFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ViewFactory.java @@ -5,8 +5,8 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.IncludeExcludeModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewStreamModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.IncludeExcludeModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewStreamModel; import io.opentelemetry.sdk.metrics.View; import io.opentelemetry.sdk.metrics.ViewBuilder; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AggregationFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AggregationFactoryTest.java index 6e4310a9e9a..15821175c8c 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AggregationFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AggregationFactoryTest.java @@ -8,12 +8,12 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.Mockito.mock; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AggregationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.Base2ExponentialBucketHistogramAggregationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.DropAggregationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExplicitBucketHistogramAggregationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LastValueAggregationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SumAggregationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AggregationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.Base2ExponentialBucketHistogramAggregationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.DropAggregationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExplicitBucketHistogramAggregationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LastValueAggregationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SumAggregationModel; import io.opentelemetry.sdk.metrics.Aggregation; import io.opentelemetry.sdk.metrics.Base2ExponentialHistogramOptions; import io.opentelemetry.sdk.metrics.ExplicitBucketHistogramOptions; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactoryTest.java index 251776ab82f..b1de9633291 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/AttributeListFactoryTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeNameValueModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeNameValueModel; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/CardinalityLimitsFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/CardinalityLimitsFactoryTest.java index d75ae97df8c..2d1be6ce68c 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/CardinalityLimitsFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/CardinalityLimitsFactoryTest.java @@ -8,7 +8,7 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.Mockito.mock; -import io.opentelemetry.sdk.declarativeconfig.internal.model.CardinalityLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.CardinalityLimitsModel; import io.opentelemetry.sdk.metrics.InstrumentType; import io.opentelemetry.sdk.metrics.export.CardinalityLimitSelector; import java.util.stream.Stream; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactoryTest.java index aae18522053..f97cd2e9dec 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ComposableRuleBasedSamplerFactoryTest.java @@ -26,17 +26,17 @@ import io.opentelemetry.context.Context; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.ComposableRuleBasedSamplerFactory.AttributeMatcher; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.ComposableRuleBasedSamplerFactory.DeclarativeConfigSamplingPredicate; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableAlwaysOffSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableAlwaysOnSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableProbabilitySamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableRuleBasedSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableRuleBasedSamplerRuleModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalSpanParent; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanKind; import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableAlwaysOffSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableAlwaysOnSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableProbabilitySamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableRuleBasedSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalSpanParent; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanKind; import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableSampler; import io.opentelemetry.sdk.trace.IdGenerator; import java.util.Arrays; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationCreateTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationCreateTest.java index 3fbb9ad67ed..7ee1e7e0377 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationCreateTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationCreateTest.java @@ -19,9 +19,9 @@ import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.OpenTelemetrySdk; -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 io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel; import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk; import io.opentelemetry.sdk.trace.samplers.ParentBasedSamplerBuilder; import java.io.ByteArrayInputStream; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationParseTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationParseTest.java index 89ce6e7f514..9a928f8648e 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationParseTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationParseTest.java @@ -9,18 +9,18 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AggregationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeNameValueModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchSpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpHttpExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ResourceModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TraceIdRatioBasedSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AggregationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeNameValueModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchSpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ResourceModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TraceIdRatioBasedSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.util.AbstractMap; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactoryTest.java index 1083cf408df..46740e02791 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ExemplarFilterFactoryTest.java @@ -8,7 +8,7 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.Mockito.mock; -import io.opentelemetry.sdk.declarativeconfig.internal.model.MeterProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel; import io.opentelemetry.sdk.metrics.ExemplarFilter; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/IncludeExcludeFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/IncludeExcludeFactoryTest.java index 767bbfa5890..06ae1c3da78 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/IncludeExcludeFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/IncludeExcludeFactoryTest.java @@ -10,8 +10,8 @@ import io.opentelemetry.api.incubator.config.DeclarativeConfigException; import io.opentelemetry.common.ComponentLoader; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.IncludeExcludeModel; import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; -import io.opentelemetry.sdk.declarativeconfig.internal.model.IncludeExcludeModel; import java.util.Arrays; import java.util.Collections; import java.util.function.Predicate; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/InstrumentSelectorFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/InstrumentSelectorFactoryTest.java index d9f51ba3c0d..81abf386253 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/InstrumentSelectorFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/InstrumentSelectorFactoryTest.java @@ -10,7 +10,7 @@ import static org.mockito.Mockito.mock; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewSelectorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewSelectorModel; import io.opentelemetry.sdk.metrics.InstrumentSelector; import io.opentelemetry.sdk.metrics.InstrumentType; import org.junit.jupiter.api.Test; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogLimitsFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogLimitsFactoryTest.java index f907250df40..fbb8b006db6 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogLimitsFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogLimitsFactoryTest.java @@ -8,8 +8,8 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.Mockito.mock; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordLimitsModel; import io.opentelemetry.sdk.logs.LogLimits; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordExporterFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordExporterFactoryTest.java index a9ec85d238b..0664f5751d2 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordExporterFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordExporterFactoryTest.java @@ -18,15 +18,15 @@ import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporter; import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.component.LogRecordExporterComponentProvider; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ConsoleExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalOtlpFileExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.GrpcTlsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.HttpTlsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordExporterPropertyModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.NameStringValuePairModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpGrpcExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpHttpExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ConsoleExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalOtlpFileExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.GrpcTlsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.HttpTlsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterPropertyModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.NameStringValuePairModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpGrpcExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpExporterModel; import io.opentelemetry.sdk.logs.export.LogRecordExporter; import java.io.Closeable; import java.io.IOException; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordProcessorFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordProcessorFactoryTest.java index f884f2e89fb..ffe85a928fe 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordProcessorFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LogRecordProcessorFactoryTest.java @@ -13,12 +13,12 @@ import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter; import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.component.LogRecordProcessorComponentProvider; -import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchLogRecordProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordProcessorPropertyModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpHttpExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SimpleLogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchLogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordProcessorPropertyModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SimpleLogRecordProcessorModel; import io.opentelemetry.sdk.extension.incubator.logs.EventToSpanEventBridge; import io.opentelemetry.sdk.logs.LogRecordProcessor; import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactoryTest.java index 606973c3036..12faa1bb108 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/LoggerProviderFactoryTest.java @@ -12,19 +12,19 @@ import io.opentelemetry.common.ComponentLoader; import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter; import io.opentelemetry.internal.testing.CleanupExtension; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchLogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLoggerConfigModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLoggerConfiguratorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLoggerMatcherAndConfigModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LoggerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel.SeverityNumber; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpExporterModel; import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchLogRecordProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalLoggerConfigModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalLoggerConfiguratorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalLoggerMatcherAndConfigModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LoggerProviderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel.SeverityNumber; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpHttpExporterModel; import io.opentelemetry.sdk.logs.LogLimits; import io.opentelemetry.sdk.logs.SdkLoggerProvider; import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactoryTest.java index 5470e7cd90f..2b842be6f24 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MeterProviderFactoryTest.java @@ -11,19 +11,19 @@ import io.opentelemetry.common.ComponentLoader; import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter; import io.opentelemetry.internal.testing.CleanupExtension; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalMeterConfigModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalMeterConfiguratorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalMeterMatcherAndConfigModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PeriodicMetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PushMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewSelectorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewStreamModel; import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalMeterConfigModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalMeterConfiguratorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalMeterMatcherAndConfigModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.MeterProviderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.MetricReaderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpHttpMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PeriodicMetricReaderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PushMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewSelectorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewStreamModel; import io.opentelemetry.sdk.metrics.ExemplarFilter; import io.opentelemetry.sdk.metrics.InstrumentSelector; import io.opentelemetry.sdk.metrics.SdkMeterProvider; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricExporterFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricExporterFactoryTest.java index 99167ee15d4..5be65d1fea4 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricExporterFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricExporterFactoryTest.java @@ -18,15 +18,15 @@ import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter; import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.component.MetricExporterComponentProvider; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ConsoleMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalOtlpFileMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.GrpcTlsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.HttpTlsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.NameStringValuePairModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpGrpcMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpHttpMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PushMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PushMetricExporterPropertyModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ConsoleMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalOtlpFileMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.GrpcTlsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.HttpTlsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.NameStringValuePairModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpGrpcMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PushMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PushMetricExporterPropertyModel; import io.opentelemetry.sdk.metrics.Aggregation; import io.opentelemetry.sdk.metrics.InstrumentType; import io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricReaderFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricReaderFactoryTest.java index b84115618da..040f9a1e19c 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricReaderFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/MetricReaderFactoryTest.java @@ -19,16 +19,16 @@ import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter; import io.opentelemetry.exporter.prometheus.PrometheusHttpServer; import io.opentelemetry.internal.testing.CleanupExtension; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.CardinalityLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalPrometheusMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.IncludeExcludeModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PeriodicMetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PullMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PullMetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PushMetricExporterModel; import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; -import io.opentelemetry.sdk.declarativeconfig.internal.model.CardinalityLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalPrometheusMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.IncludeExcludeModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.MetricReaderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpHttpMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PeriodicMetricReaderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PullMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PullMetricReaderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PushMetricExporterModel; import io.opentelemetry.sdk.metrics.InstrumentType; import io.opentelemetry.sdk.metrics.export.MetricReader; import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/OpenTelemetryConfigurationFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/OpenTelemetryConfigurationFactoryTest.java index f02098aea13..e821ca587f8 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/OpenTelemetryConfigurationFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/OpenTelemetryConfigurationFactoryTest.java @@ -24,34 +24,34 @@ import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.OpenTelemetrySdk; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AlwaysOnSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeNameValueModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchLogRecordProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchSpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalResourceDetectionModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalResourceDetectorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordLimitsModel; -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.OtlpHttpExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpHttpMetricExporterModel; -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.ResourceModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SimpleLogRecordProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewSelectorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewStreamModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AlwaysOnSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeNameValueModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchLogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchSpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectionModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordLimitsModel; +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.OtlpHttpExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel; +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.ResourceModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SimpleLogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewSelectorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewStreamModel; import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk; import io.opentelemetry.sdk.internal.OpenTelemetrySdkBuilderUtil; import io.opentelemetry.sdk.internal.SdkConfigProvider; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/PropagatorFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/PropagatorFactoryTest.java index 07aca271632..6c351c4fb12 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/PropagatorFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/PropagatorFactoryTest.java @@ -17,12 +17,12 @@ import io.opentelemetry.context.propagation.TextMapPropagator; import io.opentelemetry.extension.trace.propagation.B3Propagator; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.component.TextMapPropagatorComponentProvider; -import io.opentelemetry.sdk.declarativeconfig.internal.model.B3MultiPropagatorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.B3PropagatorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.BaggagePropagatorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PropagatorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TextMapPropagatorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TraceContextPropagatorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.B3MultiPropagatorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.B3PropagatorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BaggagePropagatorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PropagatorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TextMapPropagatorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TraceContextPropagatorModel; import java.util.Arrays; import java.util.Collections; import java.util.stream.Stream; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ResourceFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ResourceFactoryTest.java index c11a3ddf04c..a3877112bca 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ResourceFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ResourceFactoryTest.java @@ -10,11 +10,11 @@ import io.opentelemetry.api.incubator.config.DeclarativeConfigException; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeNameValueModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalResourceDetectionModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalResourceDetectorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.IncludeExcludeModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ResourceModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeNameValueModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectionModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.IncludeExcludeModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ResourceModel; import io.opentelemetry.sdk.resources.Resource; import java.util.Arrays; import java.util.Collections; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SamplerFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SamplerFactoryTest.java index 19b71ef5c10..bc0034ca455 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SamplerFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SamplerFactoryTest.java @@ -13,19 +13,19 @@ import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.component.SamplerComponentProvider; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AlwaysOffSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AlwaysOnSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableAlwaysOffSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableAlwaysOnSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableParentThresholdSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableProbabilitySamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableRuleBasedSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalJaegerRemoteSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ParentBasedSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SamplerPropertyModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TraceIdRatioBasedSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AlwaysOffSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AlwaysOnSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableAlwaysOffSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableAlwaysOnSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableParentThresholdSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableProbabilitySamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableRuleBasedSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalJaegerRemoteSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ParentBasedSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerPropertyModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TraceIdRatioBasedSamplerModel; import io.opentelemetry.sdk.extension.incubator.trace.samplers.ComposableSampler; import io.opentelemetry.sdk.extension.incubator.trace.samplers.CompositeSampler; import io.opentelemetry.sdk.extension.trace.jaeger.sampler.JaegerRemoteSampler; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanExporterFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanExporterFactoryTest.java index 625e192186b..b44b52f8369 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanExporterFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanExporterFactoryTest.java @@ -18,15 +18,15 @@ import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter; import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.component.SpanExporterComponentProvider; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ConsoleExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalOtlpFileExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.GrpcTlsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.HttpTlsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.NameStringValuePairModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpGrpcExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpHttpExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterPropertyModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ConsoleExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalOtlpFileExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.GrpcTlsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.HttpTlsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.NameStringValuePairModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpGrpcExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterPropertyModel; import io.opentelemetry.sdk.trace.export.SpanExporter; import java.io.Closeable; import java.io.IOException; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanLimitsFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanLimitsFactoryTest.java index 91b7b2283e0..17728942e3e 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanLimitsFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanLimitsFactoryTest.java @@ -8,8 +8,8 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.Mockito.mock; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanLimitsModel; import io.opentelemetry.sdk.trace.SpanLimits; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanProcessorFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanProcessorFactoryTest.java index 0f07d43c16d..0e910935e1d 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanProcessorFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanProcessorFactoryTest.java @@ -13,12 +13,12 @@ import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter; import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.component.SpanProcessorComponentProvider; -import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchSpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpHttpExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SimpleSpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorPropertyModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchSpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SimpleSpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorPropertyModel; import io.opentelemetry.sdk.trace.SpanProcessor; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TestDeclarativeConfigurationCustomizerProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TestDeclarativeConfigurationCustomizerProvider.java index bfd7ce3a30a..dce74bc06a9 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TestDeclarativeConfigurationCustomizerProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TestDeclarativeConfigurationCustomizerProvider.java @@ -5,8 +5,8 @@ package io.opentelemetry.sdk.autoconfigure.declarativeconfig; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeNameValueModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ResourceModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeNameValueModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ResourceModel; import java.util.ArrayList; import java.util.List; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TracerProviderFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TracerProviderFactoryTest.java index eeffeb00e0f..64878d5c9d4 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TracerProviderFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/TracerProviderFactoryTest.java @@ -11,20 +11,20 @@ import io.opentelemetry.common.ComponentLoader; import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter; import io.opentelemetry.internal.testing.CleanupExtension; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AlwaysOnSamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AttributeLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchSpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalTracerConfigModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalTracerConfiguratorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalTracerMatcherAndConfigModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanLimitsModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel; import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AlwaysOnSamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchSpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalTracerConfigModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalTracerConfiguratorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalTracerMatcherAndConfigModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpHttpExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SamplerModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanLimitsModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder; import io.opentelemetry.sdk.trace.SpanLimits; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ViewFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ViewFactoryTest.java index 1fb466ea619..a8c69e1c444 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ViewFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/ViewFactoryTest.java @@ -8,11 +8,11 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.Mockito.mock; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.AggregationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExplicitBucketHistogramAggregationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.IncludeExcludeModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ViewStreamModel; import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; -import io.opentelemetry.sdk.declarativeconfig.internal.model.AggregationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExplicitBucketHistogramAggregationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.IncludeExcludeModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewStreamModel; import io.opentelemetry.sdk.metrics.Aggregation; import io.opentelemetry.sdk.metrics.ExplicitBucketHistogramOptions; import io.opentelemetry.sdk.metrics.View; diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/YamlDeclarativeConfigPropertiesTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/YamlDeclarativeConfigPropertiesTest.java index acc5971cb67..3b8463bc64a 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/YamlDeclarativeConfigPropertiesTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/YamlDeclarativeConfigPropertiesTest.java @@ -12,7 +12,7 @@ import io.github.netmikey.logunit.api.LogCapturer; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.util.Arrays;