From b60c2eb60d23be3315dfdaa2fd76232d112f11fa Mon Sep 17 00:00:00 2001 From: Jack Berg <34418638+jack-berg@users.noreply.github.com> Date: Wed, 8 Apr 2026 08:50:30 -0500 Subject: [PATCH 1/2] Extract declarative config to new opentelemetry-sdk-extension-decelarative-config module --- README.md | 1 + .../all/NoSharedInternalCodeTest.java | 1 + api/incubator/build.gradle.kts | 4 +- .../incubator/ExtendedOpenTelemetryTest.java | 2 +- .../config/InstrumentationConfigUtilTest.java | 4 +- .../InstrumentationConfigUtilTest.java | 10 +- .../graal-incubating/build.gradle.kts | 2 +- .../graal/IncubatingApiTests.java | 2 +- sdk-extensions/autoconfigure/build.gradle.kts | 8 +- ...AutoConfiguredOpenTelemetrySdkBuilder.java | 18 +- ...ngUtil.java => DeclarativeConfigUtil.java} | 21 +- .../DeclarativeConfigurationTest.java | 2 +- .../TestDeclarativeConfigurationProvider.java | 6 +- ...veconfig.DeclarativeConfigurationProvider} | 0 sdk-extensions/declarative-config/README.md | 28 ++ .../declarative-config/build.gradle.kts | 250 ++++++++++++++++++ .../declarative-config/gradle.properties | 1 + .../AggregationFactory.java | 8 +- .../AttributeListFactory.java | 4 +- .../CardinalityLimitsFactory.java | 4 +- .../ComposableRuleBasedSamplerFactory.java | 16 +- .../ComposableSamplerFactory.java | 8 +- .../declarativeconfig}/ConfigKeyValue.java | 2 +- .../DeclarativeConfigContext.java | 2 +- .../DeclarativeConfigResult.java | 9 +- .../DeclarativeConfiguration.java | 6 +- .../DeclarativeConfigurationBuilder.java | 4 +- .../DeclarativeConfigurationCustomizer.java | 4 +- ...rativeConfigurationCustomizerProvider.java | 2 +- .../DeclarativeConfigurationProvider.java | 4 +- .../ExemplarFilterFactory.java | 4 +- .../sdk/declarativeconfig}/Factory.java | 2 +- .../declarativeconfig}/FileConfigUtil.java | 2 +- .../InstrumentSelectorFactory.java | 4 +- .../declarativeconfig}/LogLimitsFactory.java | 6 +- .../LogRecordExporterFactory.java | 4 +- .../LogRecordLimitsAndAttributeLimits.java | 6 +- .../LogRecordProcessorFactory.java | 10 +- .../LoggerProviderAndAttributeLimits.java | 6 +- .../LoggerProviderFactory.java | 16 +- .../MeterProviderFactory.java | 20 +- .../MetricExporterFactory.java | 4 +- .../MetricReaderAndCardinalityLimits.java | 2 +- .../MetricReaderFactory.java | 14 +- .../OpenTelemetryConfigurationFactory.java | 10 +- .../declarativeconfig}/PropagatorFactory.java | 6 +- .../ResourceDetectorFactory.java | 4 +- .../declarativeconfig}/ResourceFactory.java | 16 +- .../declarativeconfig}/SamplerFactory.java | 10 +- .../ServiceResourceDetector.java | 2 +- .../SpanExporterFactory.java | 4 +- .../SpanLimitsAndAttributeLimits.java | 6 +- .../declarativeconfig}/SpanLimitsFactory.java | 6 +- .../SpanProcessorFactory.java | 10 +- .../TextMapPropagatorAndName.java | 2 +- .../TextMapPropagatorFactory.java | 4 +- .../TracerProviderAndAttributeLimits.java | 6 +- .../TracerProviderFactory.java | 14 +- .../sdk/declarativeconfig}/ViewFactory.java | 6 +- .../YamlDeclarativeConfigProperties.java | 2 +- ...toconfigure.spi.internal.ComponentProvider | 1 + .../AggregationFactoryTest.java | 14 +- .../AttributeListFactoryTest.java | 4 +- .../CapturingComponentLoader.java | 2 +- .../CardinalityLimitsFactoryTest.java | 4 +- ...ComposableRuleBasedSamplerFactoryTest.java | 28 +- .../DeclarativeConfigContextTest.java | 2 +- .../DeclarativeConfigurationBuilderTest.java | 2 +- .../DeclarativeConfigurationCreateTest.java | 10 +- .../DeclarativeConfigurationParseTest.java | 26 +- .../ExemplarFilterFactoryTest.java | 4 +- .../FileConfigTestUtil.java | 2 +- .../InstrumentSelectorFactoryTest.java | 4 +- .../LogLimitsFactoryTest.java | 6 +- .../LogRecordExporterFactoryTest.java | 24 +- .../LogRecordProcessorFactoryTest.java | 16 +- .../LoggerProviderFactoryTest.java | 24 +- .../MeterProviderFactoryTest.java | 24 +- .../MetricExporterFactoryTest.java | 24 +- .../MetricReaderFactoryTest.java | 20 +- ...OpenTelemetryConfigurationFactoryTest.java | 58 ++-- .../PropagatorFactoryTest.java | 16 +- .../ResourceFactoryTest.java | 12 +- .../SamplerFactoryTest.java | 30 +-- .../ServiceResourceDetectorTest.java | 2 +- .../SpanExporterFactoryTest.java | 24 +- .../SpanLimitsFactoryTest.java | 6 +- .../SpanProcessorFactoryTest.java | 16 +- ...rativeConfigurationCustomizerProvider.java | 6 +- .../TracerProviderFactoryTest.java | 26 +- .../declarativeconfig}/ViewFactoryTest.java | 10 +- .../YamlDeclarativeConfigPropertiesTest.java | 4 +- .../component/ContainerResourceProvider.java | 2 +- .../component/HostResourceProvider.java | 2 +- .../LogRecordExporterComponentProvider.java | 2 +- .../LogRecordProcessorComponentProvider.java | 2 +- .../MetricExporterComponentProvider.java | 2 +- .../component/OsResourceProvider.java | 2 +- .../component/ProcessResourceProvider.java | 2 +- .../component/ResourceComponentProvider.java | 2 +- .../ResourceFirstComponentProvider.java | 2 +- .../ResourceSecondComponentProvider.java | 2 +- .../component/SamplerComponentProvider.java | 2 +- .../SpanExporterComponentProvider.java | 2 +- .../SpanProcessorComponentProvider.java | 2 +- .../TextMapPropagatorComponentProvider.java | 2 +- ...toconfigure.spi.internal.ComponentProvider | 14 + ...DeclarativeConfigurationCustomizerProvider | 1 + sdk-extensions/incubator/README.md | 28 +- sdk-extensions/incubator/build.gradle.kts | 231 ---------------- .../metric/viewconfig/ViewConfig.java | 4 +- .../viewconfig/ViewConfigCustomizer.java | 4 +- ...toconfigure.spi.internal.ComponentProvider | 1 - ...toconfigure.spi.internal.ComponentProvider | 14 - ...DeclarativeConfigurationCustomizerProvider | 1 - .../jaeger-remote-sampler/build.gradle.kts | 2 +- .../JaegerRemoteSamplerComponentProvider.java | 2 +- settings.gradle.kts | 1 + 118 files changed, 724 insertions(+), 699 deletions(-) rename sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/{IncubatingUtil.java => DeclarativeConfigUtil.java} (75%) rename sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/resources/META-INF/services/{io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationProvider => io.opentelemetry.sdk.declarativeconfig.DeclarativeConfigurationProvider} (100%) create mode 100644 sdk-extensions/declarative-config/README.md create mode 100644 sdk-extensions/declarative-config/build.gradle.kts create mode 100644 sdk-extensions/declarative-config/gradle.properties rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/AggregationFactory.java (87%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/AttributeListFactory.java (96%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/CardinalityLimitsFactory.java (92%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/ComposableRuleBasedSamplerFactory.java (91%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/ComposableSamplerFactory.java (84%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/ConfigKeyValue.java (91%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/DeclarativeConfigContext.java (99%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/DeclarativeConfigResult.java (64%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/DeclarativeConfiguration.java (98%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/DeclarativeConfigurationBuilder.java (96%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/DeclarativeConfigurationCustomizer.java (94%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/DeclarativeConfigurationCustomizerProvider.java (90%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/DeclarativeConfigurationProvider.java (75%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/ExemplarFilterFactory.java (86%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/Factory.java (87%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/FileConfigUtil.java (96%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/InstrumentSelectorFactory.java (92%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/LogLimitsFactory.java (86%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/LogRecordExporterFactory.java (87%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/LogRecordLimitsAndAttributeLimits.java (70%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/LogRecordProcessorFactory.java (87%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/LoggerProviderAndAttributeLimits.java (70%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/LoggerProviderFactory.java (87%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/MeterProviderFactory.java (82%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/MetricExporterFactory.java (87%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/MetricReaderAndCardinalityLimits.java (92%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/MetricReaderFactory.java (85%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/OpenTelemetryConfigurationFactory.java (91%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/PropagatorFactory.java (90%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/ResourceDetectorFactory.java (81%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/ResourceFactory.java (79%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/SamplerFactory.java (88%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/ServiceResourceDetector.java (96%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/SpanExporterFactory.java (87%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/SpanLimitsAndAttributeLimits.java (69%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/SpanLimitsFactory.java (89%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/SpanProcessorFactory.java (87%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/TextMapPropagatorAndName.java (89%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/TextMapPropagatorFactory.java (90%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/TracerProviderAndAttributeLimits.java (70%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/TracerProviderFactory.java (85%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/ViewFactory.java (85%) rename sdk-extensions/{incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig}/YamlDeclarativeConfigProperties.java (99%) create mode 100644 sdk-extensions/declarative-config/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/AggregationFactoryTest.java (89%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/AttributeListFactoryTest.java (97%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/CapturingComponentLoader.java (97%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/CardinalityLimitsFactoryTest.java (94%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/ComposableRuleBasedSamplerFactoryTest.java (89%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/DeclarativeConfigContextTest.java (97%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/DeclarativeConfigurationBuilderTest.java (98%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/DeclarativeConfigurationCreateTest.java (94%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/DeclarativeConfigurationParseTest.java (94%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/ExemplarFilterFactoryTest.java (88%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/FileConfigTestUtil.java (88%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/InstrumentSelectorFactoryTest.java (92%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/LogLimitsFactoryTest.java (88%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/LogRecordExporterFactoryTest.java (93%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/LogRecordProcessorFactoryTest.java (89%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/LoggerProviderFactoryTest.java (85%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/MeterProviderFactoryTest.java (80%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/MetricExporterFactoryTest.java (94%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/MetricReaderFactoryTest.java (91%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/OpenTelemetryConfigurationFactoryTest.java (85%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/PropagatorFactoryTest.java (88%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/ResourceFactoryTest.java (93%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/SamplerFactoryTest.java (86%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/ServiceResourceDetectorTest.java (97%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/SpanExporterFactoryTest.java (94%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/SpanLimitsFactoryTest.java (90%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/SpanProcessorFactoryTest.java (89%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/TestDeclarativeConfigurationCustomizerProvider.java (83%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/TracerProviderFactoryTest.java (82%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/ViewFactoryTest.java (83%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/YamlDeclarativeConfigPropertiesTest.java (98%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/ContainerResourceProvider.java (92%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/HostResourceProvider.java (92%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/LogRecordExporterComponentProvider.java (95%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/LogRecordProcessorComponentProvider.java (94%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/MetricExporterComponentProvider.java (96%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/OsResourceProvider.java (92%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/ProcessResourceProvider.java (92%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/ResourceComponentProvider.java (90%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/ResourceFirstComponentProvider.java (90%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/ResourceSecondComponentProvider.java (90%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/SamplerComponentProvider.java (95%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/SpanExporterComponentProvider.java (95%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/SpanProcessorComponentProvider.java (95%) rename sdk-extensions/{incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig => declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig}/component/TextMapPropagatorComponentProvider.java (95%) create mode 100644 sdk-extensions/declarative-config/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider create mode 100644 sdk-extensions/declarative-config/src/test/resources/META-INF/services/io.opentelemetry.sdk.declarativeconfig.DeclarativeConfigurationCustomizerProvider delete mode 100644 sdk-extensions/incubator/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider delete mode 100644 sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider delete mode 100644 sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider diff --git a/README.md b/README.md index aac8e3900e0..8c01c5381eb 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,7 @@ Extensions to the OpenTelemetry SDK. |-------------------------------------------------------------------------------|------------------------------------------------------------------------------------|-----------------------------------------------------|-------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | [SDK Autoconfigure](./sdk-extensions/autoconfigure) | Autoconfigure OpenTelemetry SDK from env vars, system properties, and SPI | `opentelemetry-sdk-extension-autoconfigure` | 1.60.1 | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure) | | [SDK Autoconfigure SPI](./sdk-extensions/autoconfigure-spi) | Service Provider Interface (SPI) definitions for autoconfigure | `opentelemetry-sdk-extension-autoconfigure-spi` | 1.60.1 | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure-spi.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure-spi) | +| [SDK Declarative Config](./sdk-extensions/jaeger-remote-sampler) | Declarative config implementation for YAML-based SDK configuration | `opentelemetry-sdk-extension-declarative-config` | TODO: add after first release | TODO: add after first release | | [SDK Jaeger Remote Sampler Extension](./sdk-extensions/jaeger-remote-sampler) | Sampler which obtains sampling configuration from remote Jaeger server | `opentelemetry-sdk-extension-jaeger-remote-sampler` | 1.60.1 | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-jaeger-remote-sampler.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-jaeger-remote-sampler) | | [SDK Incubator](./sdk-extensions/incubator) | SDK incubator, including YAML based view configuration, LeakDetectingSpanProcessor | `opentelemetry-sdk-extension-incubator` | 1.60.1-alpha | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-incubator.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-incubator) | diff --git a/all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java b/all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java index fba0cd8cddb..33587b2b4b3 100644 --- a/all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java +++ b/all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java @@ -46,6 +46,7 @@ class NoSharedInternalCodeTest { "opentelemetry-sdk-trace", "opentelemetry-sdk-extension-autoconfigure", "opentelemetry-sdk-extension-autoconfigure-spi", + "opentelemetry-sdk-extension-declarative-config", "opentelemetry-sdk-extension-incubator", "opentelemetry-sdk-extension-jaeger-remote-sampler", "opentelemetry-exporter-otlp", diff --git a/api/incubator/build.gradle.kts b/api/incubator/build.gradle.kts index 6bd0669222d..5f97afe9db9 100644 --- a/api/incubator/build.gradle.kts +++ b/api/incubator/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { annotationProcessor("com.google.auto.value:auto-value") // To use parsed config file as input for InstrumentationConfigUtilTest - testImplementation(project(":sdk-extensions:incubator")) + testImplementation(project(":sdk-extensions:declarative-config")) testImplementation(project(":sdk:testing")) testImplementation(project(":api:testing-internal")) @@ -33,7 +33,7 @@ testing { register("testConvertToModel") { dependencies { implementation("com.fasterxml.jackson.core:jackson-databind") - implementation(project(":sdk-extensions:incubator")) + implementation(project(":sdk-extensions:declarative-config")) implementation(project(":sdk-extensions:autoconfigure")) implementation("com.google.guava:guava") } diff --git a/api/incubator/src/test/java/io/opentelemetry/api/incubator/ExtendedOpenTelemetryTest.java b/api/incubator/src/test/java/io/opentelemetry/api/incubator/ExtendedOpenTelemetryTest.java index 017e691946d..bd0428a2aab 100644 --- a/api/incubator/src/test/java/io/opentelemetry/api/incubator/ExtendedOpenTelemetryTest.java +++ b/api/incubator/src/test/java/io/opentelemetry/api/incubator/ExtendedOpenTelemetryTest.java @@ -25,7 +25,7 @@ import io.opentelemetry.api.trace.TracerProvider; import io.opentelemetry.context.propagation.ContextPropagators; import io.opentelemetry.sdk.OpenTelemetrySdk; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration; import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk; import io.opentelemetry.sdk.internal.SdkConfigProvider; import java.io.ByteArrayInputStream; diff --git a/api/incubator/src/test/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtilTest.java b/api/incubator/src/test/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtilTest.java index 9048d744d36..01fe09e0f1f 100644 --- a/api/incubator/src/test/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtilTest.java +++ b/api/incubator/src/test/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtilTest.java @@ -8,8 +8,8 @@ import static org.assertj.core.api.Assertions.assertThat; import com.google.common.collect.ImmutableMap; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; -import io.opentelemetry.sdk.extension.incubator.fileconfig.YamlDeclarativeConfigProperties; +import io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.declarativeconfig.YamlDeclarativeConfigProperties; import io.opentelemetry.sdk.internal.SdkConfigProvider; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; 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 3ce2cdd992a..97ed33a0634 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 @@ -14,11 +14,11 @@ import io.opentelemetry.api.incubator.config.ConfigProvider; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.api.incubator.config.InstrumentationConfigUtil; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalInstrumentationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.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.internal.SdkConfigProvider; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; diff --git a/integration-tests/graal-incubating/build.gradle.kts b/integration-tests/graal-incubating/build.gradle.kts index 8b2153620c4..b489db95f65 100644 --- a/integration-tests/graal-incubating/build.gradle.kts +++ b/integration-tests/graal-incubating/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { implementation(project(":sdk:testing")) implementation(project(":exporters:otlp:all")) implementation(project(":api:incubator")) - implementation(project(":sdk-extensions:incubator")) + implementation(project(":sdk-extensions:declarative-config")) } // org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.0 diff --git a/integration-tests/graal-incubating/src/test/java/io/opentelemetry/integrationtests/graal/IncubatingApiTests.java b/integration-tests/graal-incubating/src/test/java/io/opentelemetry/integrationtests/graal/IncubatingApiTests.java index 209234af3d2..aa63e60953f 100644 --- a/integration-tests/graal-incubating/src/test/java/io/opentelemetry/integrationtests/graal/IncubatingApiTests.java +++ b/integration-tests/graal-incubating/src/test/java/io/opentelemetry/integrationtests/graal/IncubatingApiTests.java @@ -23,7 +23,7 @@ import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.api.trace.TracerProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration; import io.opentelemetry.sdk.logs.SdkLoggerProvider; import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor; import io.opentelemetry.sdk.metrics.SdkMeterProvider; diff --git a/sdk-extensions/autoconfigure/build.gradle.kts b/sdk-extensions/autoconfigure/build.gradle.kts index 8ef186ee14e..ac05db8b30c 100644 --- a/sdk-extensions/autoconfigure/build.gradle.kts +++ b/sdk-extensions/autoconfigure/build.gradle.kts @@ -11,7 +11,8 @@ dependencies { api(project(":sdk-extensions:autoconfigure-spi")) compileOnly(project(":api:incubator")) - compileOnly(project(":sdk-extensions:incubator")) + compileOnly(project(":sdk-extensions:declarative-config")) + // compileOnly(project(":sdk-extensions:incubator")) annotationProcessor("com.google.auto.value:auto-value") @@ -61,6 +62,7 @@ testing { implementation(project(":sdk:trace-shaded-deps")) implementation(project(":sdk-extensions:jaeger-remote-sampler")) implementation(project(":sdk-extensions:incubator")) + implementation(project(":sdk-extensions:declarative-config")) implementation("com.google.guava:guava") implementation("io.opentelemetry.proto:opentelemetry-proto") @@ -85,7 +87,7 @@ testing { } register("testIncubating") { dependencies { - implementation(project(":sdk-extensions:incubator")) + implementation(project(":sdk-extensions:declarative-config")) implementation(project(":exporters:logging")) implementation(project(":exporters:otlp:all")) implementation(project(":sdk:testing")) @@ -98,7 +100,7 @@ testing { register("testDeclarativeConfigSpi") { dependencies { - implementation(project(":sdk-extensions:incubator")) + implementation(project(":sdk-extensions:declarative-config")) implementation(project(":exporters:logging")) implementation(project(":sdk:testing")) } diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java index c4900f6d92a..3726d42aaa2 100644 --- a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java +++ b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java @@ -62,20 +62,20 @@ public final class AutoConfiguredOpenTelemetrySdkBuilder implements AutoConfigur private static final Logger logger = Logger.getLogger(AutoConfiguredOpenTelemetrySdkBuilder.class.getName()); - private static final boolean INCUBATOR_AVAILABLE; + private static final boolean DECLARATIVE_CONFIG_AVAILABLE; static { boolean incubatorAvailable = false; try { Class.forName( - "io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration", + "io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration", false, AutoConfiguredOpenTelemetrySdkBuilder.class.getClassLoader()); incubatorAvailable = true; } catch (ClassNotFoundException e) { // Not available } - INCUBATOR_AVAILABLE = incubatorAvailable; + DECLARATIVE_CONFIG_AVAILABLE = incubatorAvailable; } @Nullable private ConfigProperties config; @@ -571,10 +571,10 @@ void configureSdk( @Nullable private static AutoConfiguredOpenTelemetrySdk maybeConfigureFromFile( ConfigProperties config, ComponentLoader componentLoader) { - if (INCUBATOR_AVAILABLE) { - AutoConfiguredOpenTelemetrySdk sdk = IncubatingUtil.configureFromSpi(componentLoader); + if (DECLARATIVE_CONFIG_AVAILABLE) { + AutoConfiguredOpenTelemetrySdk sdk = DeclarativeConfigUtil.configureFromSpi(componentLoader); if (sdk != null) { - logger.fine("Autoconfigured from SPI by opentelemetry-sdk-extension-incubator"); + logger.fine("Autoconfigured from SPI by opentelemetry-sdk-extension-declarative-config"); return sdk; } } @@ -591,11 +591,11 @@ private static AutoConfiguredOpenTelemetrySdk maybeConfigureFromFile( return null; } - if (!INCUBATOR_AVAILABLE) { + if (!DECLARATIVE_CONFIG_AVAILABLE) { throw new ConfigurationException( - "Cannot autoconfigure from config file without opentelemetry-sdk-extension-incubator on the classpath"); + "Cannot autoconfigure from config file without opentelemetry-sdk-extension-declarative-config on the classpath"); } - return IncubatingUtil.configureFromFile(logger, configurationFile, componentLoader); + return DeclarativeConfigUtil.configureFromFile(logger, configurationFile, componentLoader); } private void maybeRegisterShutdownHook(OpenTelemetrySdk openTelemetrySdk) { diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/IncubatingUtil.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigUtil.java similarity index 75% rename from sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/IncubatingUtil.java rename to sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigUtil.java index 44000040718..552952d70f6 100644 --- a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/IncubatingUtil.java +++ b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigUtil.java @@ -10,10 +10,10 @@ import io.opentelemetry.api.incubator.config.DeclarativeConfigException; import io.opentelemetry.common.ComponentLoader; import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigResult; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.declarativeconfig.DeclarativeConfigResult; +import io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.declarativeconfig.DeclarativeConfigurationProvider; +import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; @@ -21,15 +21,14 @@ import javax.annotation.Nullable; /** - * Utilities for interacting with incubating components ({@code - * io.opentelemetry:opentelemetry-api-incubator} and {@code - * io.opentelemetry:opentelemetry-sdk-extension-incubator}), which are not guaranteed to be present - * on the classpath. For all methods, callers MUST first separately reflectively confirm that the - * incubator is available on the classpath. + * Utilities for interacting with ({@code + * io.opentelemetry:opentelemetry-sdk-extension-declarative-config}, which is not guaranteed to be + * present on the classpath. For all methods, callers MUST first separately reflectively confirm + * that the incubator is available on the classpath. */ -final class IncubatingUtil { +final class DeclarativeConfigUtil { - private IncubatingUtil() {} + private DeclarativeConfigUtil() {} static AutoConfiguredOpenTelemetrySdk configureFromFile( Logger logger, String configurationFile, ComponentLoader componentLoader) { diff --git a/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java b/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java index 1e9ad130c81..5ad20c10a35 100644 --- a/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java +++ b/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java @@ -51,7 +51,7 @@ void configFile(@TempDir Path tempDir) throws IOException { assertThatThrownBy(() -> AutoConfiguredOpenTelemetrySdk.builder().setConfig(config).build()) .isInstanceOf(ConfigurationException.class) .hasMessage( - "Cannot autoconfigure from config file without opentelemetry-sdk-extension-incubator on the classpath"); + "Cannot autoconfigure from config file without opentelemetry-sdk-extension-declarative-config on the classpath"); } @Test 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 d00649f6c94..569fe7600cc 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 @@ -5,9 +5,9 @@ package io.opentelemetry.sdk.autoconfigure; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.declarativeconfig.DeclarativeConfigurationProvider; +import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; diff --git a/sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/resources/META-INF/services/io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationProvider b/sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/resources/META-INF/services/io.opentelemetry.sdk.declarativeconfig.DeclarativeConfigurationProvider similarity index 100% rename from sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/resources/META-INF/services/io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationProvider rename to sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/resources/META-INF/services/io.opentelemetry.sdk.declarativeconfig.DeclarativeConfigurationProvider diff --git a/sdk-extensions/declarative-config/README.md b/sdk-extensions/declarative-config/README.md new file mode 100644 index 00000000000..99ed7553c00 --- /dev/null +++ b/sdk-extensions/declarative-config/README.md @@ -0,0 +1,28 @@ +# Declarative Configuration + +The [declarative configuration interface](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/README.md#declarative-configuration) allows for YAML based file configuration of `OpenTelemetrySdk`. + +Usage: + +```shell +File yamlConfigFile = new File("/path/to/config.yaml"); +OpenTelemetrySdk openTelemetrySdk; +try (FileInputStream yamlConfigFileInputStream = new FileInputStream("/path/to/config.yaml")) { + openTelemetrySdk = DeclarativeConfiguration.parseAndCreate(yamlConfigFileInputStream).getSdk(); +} +// ...proceed with application after successful initialization of OpenTelemetrySdk +``` + +Notes: +* Environment variable substitution is supported as [defined in the spec](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/data-model.md#environment-variable-substitution) +* Customization is limited to customizing the in-memory config model, or exporters. See `DeclarativeConfigurationCustomizer` SPI for details. +* Custom SDK extension components which reference the [ComponentProvider](https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/autoconfigure-spi/src/main/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ComponentProvider.java) SPI can be referenced in declarative configuration. Supported types include: + * `Resource` + * `SpanExporter` + * `MetricExporter` + * `LogRecordExporter` + * `SpanProcessor` + * `LogRecordProcessor` + * `TextMapPropagator` + * `Sampler` +* You can use declarative configuration with [autoconfigure](https://opentelemetry.io/docs/languages/java/configuration/#declarative-configuration) to specify a configuration file via environment variable, e.g. `OTEL_CONFIG_FILE=/path/to/config.yaml`. diff --git a/sdk-extensions/declarative-config/build.gradle.kts b/sdk-extensions/declarative-config/build.gradle.kts new file mode 100644 index 00000000000..2c047cd3b15 --- /dev/null +++ b/sdk-extensions/declarative-config/build.gradle.kts @@ -0,0 +1,250 @@ +import de.undercouch.gradle.tasks.download.Download + +plugins { + id("otel.java-conventions") + id("otel.publish-conventions") + + id("otel.animalsniffer-conventions") + + id("de.undercouch.download") + id("org.jsonschema2pojo") +} + +description = "OpenTelemetry SDK Declarative Config" +otelJava.moduleName.set("io.opentelemetry.sdk.declarativeconfig") + +dependencies { + api(project(":sdk:all")) + api(project(":api:incubator")) + implementation(project(":sdk-extensions:autoconfigure-spi")) + // Needed for composable samplers + implementation(project(":sdk-extensions:incubator")) + + annotationProcessor("com.google.auto.value:auto-value") + + api("com.fasterxml.jackson.core:jackson-annotations") + implementation("org.snakeyaml:snakeyaml-engine") + implementation("com.fasterxml.jackson.core:jackson-databind") + + testImplementation(project(":sdk:testing")) + testImplementation(project(":exporters:logging")) + testImplementation(project(":exporters:logging-otlp")) + testImplementation(project(":exporters:otlp:all")) + testImplementation(project(":exporters:prometheus")) + testImplementation(project(":sdk-extensions:jaeger-remote-sampler")) + testImplementation(project(":extensions:trace-propagators")) + testImplementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator") + testImplementation("com.linecorp.armeria:armeria-junit5") +// + testImplementation("com.google.guava:guava-testlib") +} + +// The following tasks download the JSON Schema files from open-telemetry/opentelemetry-configuration and generate classes from the type definitions which are used with jackson-databind to parse JSON / YAML to the configuration schema. +// The sequence of tasks is: +// 1. downloadConfigurationSchema - download configuration schema from open-telemetry/opentelemetry-configuration +// 2. unzipConfigurationSchema - unzip the configuration schema archive contents to $buildDir/configuration/ +// 3. generateJsonSchema2Pojo - generate java POJOs from the configuration schema +// 4. jsonSchema2PojoPostProcessing - perform various post processing on the generated POJOs, e.g. replace javax.annotation.processing.Generated with javax.annotation.Generated, add @SuppressWarning("rawtypes") annotation +// 5. overwriteJs2p - overwrite original generated classes with versions containing updated @Generated annotation +// 6. deleteJs2pTmp - delete tmp directory +// ... proceed with normal sourcesJar, compileJava, etc + +val configurationTag = "1.0.0" +val configurationRef = "refs/tags/v$configurationTag" // Replace with commit SHA to point to experiment with a specific commit +val configurationRepoZip = "https://github.com/open-telemetry/opentelemetry-configuration/archive/$configurationRef.zip" +val buildDirectory = layout.buildDirectory.asFile.get() + +val downloadConfigurationSchema by tasks.registering(Download::class) { + src(configurationRepoZip) + // The version is encoded in the filename so that a configurationTag change results in a new + // path that doesn't yet exist, triggering a fresh download. On subsequent builds with the same + // tag the file already exists and overwrite(false) skips the network request. Note: the + // de.undercouch Download task always reports itself as not up-to-date, so overwrite(false) is + // the intended mechanism for avoiding redundant downloads. + // + // The zip is stored in tmp/ so it is outside the Sync task's output directory (configuration/). + dest("$buildDirectory/tmp/opentelemetry-configuration-v$configurationTag.zip") + overwrite(false) +} + +val unzipConfigurationSchema by tasks.registering(Sync::class) { + // Sync (not Copy) removes stale files from the destination when the source changes, ensuring + // files deleted or renamed between schema versions don't linger in the build dir. + dependsOn(downloadConfigurationSchema) + + from(zipTree(downloadConfigurationSchema.get().dest)) + eachFile(closureOf { + // Remove the top level folder "/opentelemetry-configuration-$configurationRef" + val pathParts = path.split("/") + path = pathParts.subList(1, pathParts.size).joinToString("/") + }) + into("$buildDirectory/configuration/") + includeEmptyDirs = false +} + +jsonSchema2Pojo { + sourceFiles = setOf(file("$buildDirectory/configuration/opentelemetry_configuration.json")) + targetDirectory = file("$buildDirectory/generated/sources/js2p/java/main") + targetPackage = "io.opentelemetry.sdk.declarativeconfig.internal.model" + + // Clear old source files to avoid contaminated source dir when updating + removeOldOutput = true + + // Include @Nullable annotation. Note: jsonSchmea2Pojo will not add @Nullable annotations on getters + // so we perform some steps in jsonSchema2PojoPostProcessing to add these. + includeJsr305Annotations = true + + // Prefer builders to setters + includeSetters = false + generateBuilders = true + + // Use title field to generate class name, instead of default which is based on filename / propertynames + useTitleAsClassname = true + + // Force java 9+ @Generated annotation, since java 8 @Generated annotation isn't detected by + // jsonSchema2Pojo and annotation is skipped altogether + targetVersion = "1.9" + + // Append Model as suffix to the generated classes. + classNameSuffix = "Model" +} + +val generateJsonSchema2Pojo = tasks.getByName("generateJsonSchema2Pojo") +generateJsonSchema2Pojo.dependsOn(unzipConfigurationSchema) + +val jsonSchema2PojoPostProcessing by tasks.registering(Copy::class) { + dependsOn(generateJsonSchema2Pojo) + + from("$buildDirectory/generated/sources/js2p") + into("$buildDirectory/generated/sources/js2p-tmp") + filter { + it + // Remove @Nullable annotation so it can be deterministically added later + .replace("import javax.annotation.Nullable;\n", "") + // Replace java 9+ @Generated annotation with java 8 version, add @Nullable annotation + .replace("import javax.annotation.processing.Generated;", "import javax.annotation.Nullable;\nimport javax.annotation.Generated;") + // Add @SuppressWarnings("rawtypes") annotation to address raw types used in jsonschema2pojo builders + .replace("@Generated(\"jsonschema2pojo\")", "@Generated(\"jsonschema2pojo\")\n@SuppressWarnings(\"rawtypes\")") + // Add @Nullable annotations to all getters + .replace("( *)public ([a-zA-Z]*) get([a-zA-Z]*)".toRegex(), "$1@Nullable\n$1public $2 get$3") + } +} +val overwriteJs2p by tasks.registering(Copy::class) { + dependsOn(jsonSchema2PojoPostProcessing) + + from("$buildDirectory/generated/sources/js2p-tmp") + into("$buildDirectory/generated/sources/js2p") +} +val deleteJs2pTmp by tasks.registering(Delete::class) { + dependsOn(overwriteJs2p) + + delete("$buildDirectory/generated/sources/js2p-tmp/") +} + +// 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 +// autoconfigure and without the risk of divergence from manual syncing. +val generatedResourceConfigDir = + layout.buildDirectory.dir("generated/sources/resource-configuration/java/main") +val copyResourceConfiguration by tasks.registering(Copy::class) { + from( + project(":sdk-extensions:autoconfigure").file( + "src/main/java/io/opentelemetry/sdk/autoconfigure/EnvironmentResource.java" + ) + ) + into(generatedResourceConfigDir.map { it.dir("io/opentelemetry/sdk/declarativeconfig") }) + // Only the package declaration needs rewriting; everything else is copied verbatim. + filter { line: String -> + line.replace( + "package io.opentelemetry.sdk.autoconfigure;", + "package io.opentelemetry.sdk.declarativeconfig;" + ) + } +} + +sourceSets { + main { + java { + srcDir(generatedResourceConfigDir) + } + } +} + +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" + ) + val sourcePackage = + "io.opentelemetry.sdk.declarativeconfig.internal.model" + val sourcePackagePath = sourcePackage.replace(".", "/") + val classesDir = + File( + buildDir, + "classes/java/main/$sourcePackagePath" + ) + + inputs.dir(classesDir) + outputs.file(targetFile) + + onlyIf { !targetFile.exists() } + + dependsOn("compileJava") + + doLast { + println("Generating GraalVM reflection config at: ${targetFile.absolutePath}") + + val classes = mutableListOf() + classesDir.walkTopDown().filter { it.isFile && it.extension == "class" }.forEach { file -> + val relativePath = file.toRelativeString(classesDir) + val className = relativePath + .removeSuffix(".class") + .replace(File.separatorChar, '.') + classes.add("$sourcePackage.$className") + } + classes.sort() + + targetFile.parentFile.mkdirs() + targetFile.bufferedWriter().use { writer -> + writer.write("[\n") + classes.forEachIndexed { index, className -> + writer.write(" {\n") + writer.write(" \"name\": \"$className\",\n") + writer.write(" \"allDeclaredMethods\": true,\n") + writer.write(" \"allDeclaredFields\": true,\n") + writer.write(" \"allDeclaredConstructors\": true\n") + writer.write(" }") + if (index < classes.size - 1) { + writer.write(",\n") + } else { + writer.write("\n") + } + } + writer.write("]\n") + } + } +} + +tasks.getByName("compileJava").dependsOn(deleteJs2pTmp, copyResourceConfiguration) +tasks.getByName("sourcesJar").dependsOn(deleteJs2pTmp, buildGraalVmReflectionJson, copyResourceConfiguration) +tasks.getByName("jar").dependsOn(deleteJs2pTmp, buildGraalVmReflectionJson) +tasks.getByName("javadoc").dependsOn(buildGraalVmReflectionJson) +tasks.getByName("compileTestJava").dependsOn(buildGraalVmReflectionJson) + +// Exclude jsonschema2pojo generated sources from checkstyle +tasks.named("checkstyleMain") { + dependsOn(buildGraalVmReflectionJson) + exclude("**/declarativeconfig/internal/model/**") +} + +tasks { + withType().configureEach { + environment( + mapOf( + // Expose the kitchen sink example file to tests + "CONFIG_REPO_ROOT" to "$buildDirectory/configuration" + ) + ) + } +} diff --git a/sdk-extensions/declarative-config/gradle.properties b/sdk-extensions/declarative-config/gradle.properties new file mode 100644 index 00000000000..4476ae57e31 --- /dev/null +++ b/sdk-extensions/declarative-config/gradle.properties @@ -0,0 +1 @@ +otel.release=alpha diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AggregationFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/AggregationFactory.java similarity index 87% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AggregationFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/AggregationFactory.java index 3d2059bc4bc..368174a0d10 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AggregationFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/AggregationFactory.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AggregationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Base2ExponentialBucketHistogramAggregationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExplicitBucketHistogramAggregationModel; +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.metrics.Aggregation; import io.opentelemetry.sdk.metrics.Base2ExponentialHistogramOptions; import io.opentelemetry.sdk.metrics.ExplicitBucketHistogramOptions; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AttributeListFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/AttributeListFactory.java similarity index 96% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AttributeListFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/AttributeListFactory.java index dbee194edb6..9cab6886b0a 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AttributeListFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/AttributeListFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static java.util.stream.Collectors.toList; @@ -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.extension.incubator.fileconfig.internal.model.AttributeNameValueModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeNameValueModel; import java.util.List; import javax.annotation.Nullable; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/CardinalityLimitsFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/CardinalityLimitsFactory.java similarity index 92% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/CardinalityLimitsFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/CardinalityLimitsFactory.java index 136be5f0329..436e1d4d87a 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/CardinalityLimitsFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/CardinalityLimitsFactory.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.CardinalityLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.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/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ComposableRuleBasedSamplerFactory.java similarity index 91% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ComposableRuleBasedSamplerFactory.java index aea589ede38..858351ed287 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ComposableRuleBasedSamplerFactory.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigUtil.requireNonNull; +import static io.opentelemetry.sdk.declarativeconfig.FileConfigUtil.requireNonNull; import static java.util.stream.Collectors.toSet; import io.opentelemetry.api.common.Attributes; @@ -14,11 +14,11 @@ import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableRuleBasedSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalSpanParent; +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; @@ -181,7 +181,7 @@ public String toString() { } private static SpanKind toSpanKind( - io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanKind spanKind) { + io.opentelemetry.sdk.declarativeconfig.internal.model.SpanKind spanKind) { switch (spanKind) { case INTERNAL: return SpanKind.INTERNAL; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableSamplerFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ComposableSamplerFactory.java similarity index 84% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableSamplerFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ComposableSamplerFactory.java index 9d81966793b..7d59f20f17e 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableSamplerFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ComposableSamplerFactory.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableParentThresholdSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableProbabilitySamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableSamplerModel; +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.extension.incubator.trace.samplers.ComposableSampler; final class ComposableSamplerFactory diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ConfigKeyValue.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ConfigKeyValue.java similarity index 91% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ConfigKeyValue.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ConfigKeyValue.java index 3d7e577a99d..501e7d39891 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ConfigKeyValue.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ConfigKeyValue.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigContext.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigContext.java similarity index 99% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigContext.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigContext.java index f6136a240f4..8c0627e5ef6 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigContext.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigContext.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.api.incubator.config.ConfigProvider; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigResult.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigResult.java similarity index 64% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigResult.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigResult.java index 831faea7796..e58b9275466 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigResult.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigResult.java @@ -3,16 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk; import io.opentelemetry.sdk.resources.Resource; -/** - * The result of {@link - * io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration#create(OpenTelemetryConfigurationModel)}. - */ +/** The result of {@link DeclarativeConfiguration#create(OpenTelemetryConfigurationModel)}. */ public final class DeclarativeConfigResult { private final ExtendedOpenTelemetrySdk sdk; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfiguration.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfiguration.java similarity index 98% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfiguration.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfiguration.java index 51ba03c8e33..b1a45b45642 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfiguration.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; @@ -16,8 +16,8 @@ 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.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel; +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/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationBuilder.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationBuilder.java similarity index 96% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationBuilder.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationBuilder.java index 6ec4bebc3ce..ed07d14350a 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationBuilder.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationBuilder.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.declarativeconfig.internal.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/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCustomizer.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationCustomizer.java similarity index 94% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCustomizer.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationCustomizer.java index 727accff05c..cd4198ea9c7 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCustomizer.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationCustomizer.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.declarativeconfig.internal.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/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCustomizerProvider.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationCustomizerProvider.java similarity index 90% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCustomizerProvider.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationCustomizerProvider.java index e5ec52c60d4..7a45c08cc4c 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCustomizerProvider.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationCustomizerProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.sdk.autoconfigure.spi.Ordered; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationProvider.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationProvider.java similarity index 75% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationProvider.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationProvider.java index 37c181f9401..4e7751032e5 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationProvider.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationProvider.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; import javax.annotation.Nullable; /** A service provider interface (SPI) for providing a declarative configuration model. */ diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ExemplarFilterFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ExemplarFilterFactory.java similarity index 86% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ExemplarFilterFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ExemplarFilterFactory.java index b5c3aea4473..5dd05628801 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ExemplarFilterFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ExemplarFilterFactory.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MeterProviderModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.MeterProviderModel; import io.opentelemetry.sdk.metrics.ExemplarFilter; final class ExemplarFilterFactory diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/Factory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/Factory.java similarity index 87% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/Factory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/Factory.java index 463939e3de4..9710c69a18a 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/Factory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/Factory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; interface Factory { diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigUtil.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/FileConfigUtil.java similarity index 96% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigUtil.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/FileConfigUtil.java index 7496240990f..b27734d2d9f 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigUtil.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/FileConfigUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static java.util.stream.Collectors.joining; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/InstrumentSelectorFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/InstrumentSelectorFactory.java similarity index 92% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/InstrumentSelectorFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/InstrumentSelectorFactory.java index 9a9a63d7ea4..1ce1598f87c 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/InstrumentSelectorFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/InstrumentSelectorFactory.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewSelectorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.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/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogLimitsFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LogLimitsFactory.java similarity index 86% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogLimitsFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LogLimitsFactory.java index a67e5e7c729..935bb345fa5 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogLimitsFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LogLimitsFactory.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordLimitsModel; import io.opentelemetry.sdk.logs.LogLimits; import io.opentelemetry.sdk.logs.LogLimitsBuilder; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordExporterFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LogRecordExporterFactory.java similarity index 87% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordExporterFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LogRecordExporterFactory.java index 350a3c02621..d14d6c3cba7 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordExporterFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LogRecordExporterFactory.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordExporterModel; import io.opentelemetry.sdk.logs.export.LogRecordExporter; final class LogRecordExporterFactory implements Factory { diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordLimitsAndAttributeLimits.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LogRecordLimitsAndAttributeLimits.java similarity index 70% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordLimitsAndAttributeLimits.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LogRecordLimitsAndAttributeLimits.java index bfea53b9a0e..2892d4e19fe 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordLimitsAndAttributeLimits.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LogRecordLimitsAndAttributeLimits.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import com.google.auto.value.AutoValue; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordLimitsModel; import javax.annotation.Nullable; @AutoValue diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LogRecordProcessorFactory.java similarity index 87% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LogRecordProcessorFactory.java index 402c058640c..c95f6d1a458 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LogRecordProcessorFactory.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchLogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleLogRecordProcessorModel; +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.logs.LogRecordProcessor; import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor; import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessorBuilder; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderAndAttributeLimits.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LoggerProviderAndAttributeLimits.java similarity index 70% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderAndAttributeLimits.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LoggerProviderAndAttributeLimits.java index 06abbb623f3..8d6c249b883 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderAndAttributeLimits.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LoggerProviderAndAttributeLimits.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import com.google.auto.value.AutoValue; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LoggerProviderModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.LoggerProviderModel; import javax.annotation.Nullable; @AutoValue diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LoggerProviderFactory.java similarity index 87% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LoggerProviderFactory.java index 7c948fd8116..4b6ab13dc99 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/LoggerProviderFactory.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigUtil.requireNonNull; +import static io.opentelemetry.sdk.declarativeconfig.FileConfigUtil.requireNonNull; import io.opentelemetry.api.logs.Severity; import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLoggerConfigModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLoggerConfiguratorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLoggerMatcherAndConfigModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LoggerProviderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel.SeverityNumber; +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/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/MeterProviderFactory.java similarity index 82% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/MeterProviderFactory.java index 25d365ab866..629c35bba88 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/MeterProviderFactory.java @@ -3,20 +3,20 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigUtil.requireNonNull; +import static io.opentelemetry.sdk.declarativeconfig.FileConfigUtil.requireNonNull; import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalMeterConfigModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalMeterConfiguratorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalMeterMatcherAndConfigModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MeterProviderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewSelectorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel; +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/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricExporterFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/MetricExporterFactory.java similarity index 87% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricExporterFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/MetricExporterFactory.java index c884e42b753..e8b24071ab7 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricExporterFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/MetricExporterFactory.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.PushMetricExporterModel; import io.opentelemetry.sdk.metrics.export.MetricExporter; final class MetricExporterFactory implements Factory { diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderAndCardinalityLimits.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/MetricReaderAndCardinalityLimits.java similarity index 92% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderAndCardinalityLimits.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/MetricReaderAndCardinalityLimits.java index 6bcd77e47ab..aebddf74008 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderAndCardinalityLimits.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/MetricReaderAndCardinalityLimits.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import com.google.auto.value.AutoValue; import io.opentelemetry.sdk.metrics.export.CardinalityLimitSelector; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/MetricReaderFactory.java similarity index 85% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/MetricReaderFactory.java index 16695e32fb3..7369d50dceb 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/MetricReaderFactory.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigUtil.requireNonNull; +import static io.opentelemetry.sdk.declarativeconfig.FileConfigUtil.requireNonNull; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PeriodicMetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PullMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PullMetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterModel; +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.metrics.export.CardinalityLimitSelector; import io.opentelemetry.sdk.metrics.export.MetricExporter; import io.opentelemetry.sdk.metrics.export.MetricReader; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/OpenTelemetryConfigurationFactory.java similarity index 91% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/OpenTelemetryConfigurationFactory.java index a2e9f36bd7f..5c672dfa646 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/OpenTelemetryConfigurationFactory.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.OpenTelemetrySdkBuilder; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LoggerProviderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MeterProviderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel; +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.internal.ExtendedOpenTelemetrySdk; import io.opentelemetry.sdk.internal.OpenTelemetrySdkBuilderUtil; import io.opentelemetry.sdk.internal.SdkConfigProvider; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/PropagatorFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/PropagatorFactory.java similarity index 90% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/PropagatorFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/PropagatorFactory.java index 6c561c85ade..a6a04a9c27a 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/PropagatorFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/PropagatorFactory.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.context.propagation.ContextPropagators; import io.opentelemetry.context.propagation.TextMapPropagator; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PropagatorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TextMapPropagatorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.PropagatorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.TextMapPropagatorModel; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceDetectorFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ResourceDetectorFactory.java similarity index 81% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceDetectorFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ResourceDetectorFactory.java index 1281d19e5ec..4ffd2054932 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceDetectorFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ResourceDetectorFactory.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalResourceDetectorModel; import io.opentelemetry.sdk.resources.Resource; final class ResourceDetectorFactory diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ResourceFactory.java similarity index 79% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ResourceFactory.java index a3c981e9b04..f395149b2ff 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ResourceFactory.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import static io.opentelemetry.sdk.extension.incubator.fileconfig.EnvironmentResource.ATTRIBUTE_PROPERTY; -import static io.opentelemetry.sdk.extension.incubator.fileconfig.EnvironmentResource.createEnvironmentResource; +import static io.opentelemetry.sdk.declarativeconfig.EnvironmentResource.ATTRIBUTE_PROPERTY; +import static io.opentelemetry.sdk.declarativeconfig.EnvironmentResource.createEnvironmentResource; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeNameValueModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectionModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ResourceModel; +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/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SamplerFactory.java similarity index 88% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SamplerFactory.java index fe8ee9b5924..447502a2609 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SamplerFactory.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalProbabilitySamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ParentBasedSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TraceIdRatioBasedSamplerModel; +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.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/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ServiceResourceDetector.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ServiceResourceDetector.java similarity index 96% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ServiceResourceDetector.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ServiceResourceDetector.java index 2bd59f046e9..a7c12002340 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ServiceResourceDetector.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ServiceResourceDetector.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanExporterFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SpanExporterFactory.java similarity index 87% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanExporterFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SpanExporterFactory.java index 11bf3dfbf93..148e592b0e3 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanExporterFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SpanExporterFactory.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterModel; import io.opentelemetry.sdk.trace.export.SpanExporter; final class SpanExporterFactory implements Factory { diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanLimitsAndAttributeLimits.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SpanLimitsAndAttributeLimits.java similarity index 69% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanLimitsAndAttributeLimits.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SpanLimitsAndAttributeLimits.java index dad8dab1019..bd133dcd4c1 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanLimitsAndAttributeLimits.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SpanLimitsAndAttributeLimits.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import com.google.auto.value.AutoValue; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanLimitsModel; import javax.annotation.Nullable; @AutoValue diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanLimitsFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SpanLimitsFactory.java similarity index 89% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanLimitsFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SpanLimitsFactory.java index 284925aa24d..5211e5a854d 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanLimitsFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SpanLimitsFactory.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanLimitsModel; import io.opentelemetry.sdk.trace.SpanLimits; import io.opentelemetry.sdk.trace.SpanLimitsBuilder; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SpanProcessorFactory.java similarity index 87% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SpanProcessorFactory.java index 8bdee9134e9..074e7c418a0 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/SpanProcessorFactory.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchSpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleSpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel; +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.trace.SpanProcessor; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; import io.opentelemetry.sdk.trace.export.BatchSpanProcessorBuilder; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorAndName.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/TextMapPropagatorAndName.java similarity index 89% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorAndName.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/TextMapPropagatorAndName.java index df4beb54192..5138c8940ad 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorAndName.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/TextMapPropagatorAndName.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import com.google.auto.value.AutoValue; import io.opentelemetry.context.propagation.TextMapPropagator; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/TextMapPropagatorFactory.java similarity index 90% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/TextMapPropagatorFactory.java index c9cf9a890a7..d5597793bb7 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TextMapPropagatorFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/TextMapPropagatorFactory.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator; import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator; import io.opentelemetry.context.propagation.TextMapPropagator; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TextMapPropagatorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.TextMapPropagatorModel; final class TextMapPropagatorFactory implements Factory { diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderAndAttributeLimits.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/TracerProviderAndAttributeLimits.java similarity index 70% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderAndAttributeLimits.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/TracerProviderAndAttributeLimits.java index bcc73943b63..b1e53e5d436 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderAndAttributeLimits.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/TracerProviderAndAttributeLimits.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import com.google.auto.value.AutoValue; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel; import javax.annotation.Nullable; @AutoValue diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/TracerProviderFactory.java similarity index 85% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/TracerProviderFactory.java index 59fcfa4ab27..a30ffae3bf2 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/TracerProviderFactory.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigUtil.requireNonNull; +import static io.opentelemetry.sdk.declarativeconfig.FileConfigUtil.requireNonNull; import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalTracerConfigModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalTracerConfiguratorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalTracerMatcherAndConfigModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel; +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/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactory.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ViewFactory.java similarity index 85% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactory.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ViewFactory.java index 1860c3dea9c..cfe4951a4f3 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactory.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/ViewFactory.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.IncludeExcludeModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.ViewStreamModel; import io.opentelemetry.sdk.metrics.View; import io.opentelemetry.sdk.metrics.ViewBuilder; import java.util.List; diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlDeclarativeConfigProperties.java b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/YamlDeclarativeConfigProperties.java similarity index 99% rename from sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlDeclarativeConfigProperties.java rename to sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/YamlDeclarativeConfigProperties.java index 99161dc01ba..247d435a35b 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlDeclarativeConfigProperties.java +++ b/sdk-extensions/declarative-config/src/main/java/io/opentelemetry/sdk/declarativeconfig/YamlDeclarativeConfigProperties.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; diff --git a/sdk-extensions/declarative-config/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/sdk-extensions/declarative-config/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider new file mode 100644 index 00000000000..8649a3deeb2 --- /dev/null +++ b/sdk-extensions/declarative-config/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider @@ -0,0 +1 @@ +io.opentelemetry.sdk.declarativeconfig.ServiceResourceDetector diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AggregationFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/AggregationFactoryTest.java similarity index 89% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AggregationFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/AggregationFactoryTest.java index 9b043bf54a7..c1791cff561 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AggregationFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/AggregationFactoryTest.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.Mockito.mock; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AggregationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.Base2ExponentialBucketHistogramAggregationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.DropAggregationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExplicitBucketHistogramAggregationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LastValueAggregationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SumAggregationModel; +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.metrics.Aggregation; import io.opentelemetry.sdk.metrics.Base2ExponentialHistogramOptions; import io.opentelemetry.sdk.metrics.ExplicitBucketHistogramOptions; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AttributeListFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/AttributeListFactoryTest.java similarity index 97% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AttributeListFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/AttributeListFactoryTest.java index 382fd772f8b..9f5a771c197 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/AttributeListFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/AttributeListFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -11,7 +11,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeNameValueModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeNameValueModel; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/CapturingComponentLoader.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/CapturingComponentLoader.java similarity index 97% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/CapturingComponentLoader.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/CapturingComponentLoader.java index ee99e1e1517..6c7726ab951 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/CapturingComponentLoader.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/CapturingComponentLoader.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.common.ComponentLoader; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/CardinalityLimitsFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/CardinalityLimitsFactoryTest.java similarity index 94% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/CardinalityLimitsFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/CardinalityLimitsFactoryTest.java index 103abba7ee0..01d3c761a3b 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/CardinalityLimitsFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/CardinalityLimitsFactoryTest.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.Mockito.mock; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.CardinalityLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.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/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ComposableRuleBasedSamplerFactoryTest.java similarity index 89% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ComposableRuleBasedSamplerFactoryTest.java index 7e0c05e251d..680d1dc358f 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ComposableRuleBasedSamplerFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ComposableRuleBasedSamplerFactoryTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.api.trace.SpanKind.CLIENT; import static io.opentelemetry.api.trace.SpanKind.CONSUMER; import static io.opentelemetry.api.trace.SpanKind.INTERNAL; import static io.opentelemetry.api.trace.SpanKind.PRODUCER; import static io.opentelemetry.api.trace.SpanKind.SERVER; -import static io.opentelemetry.sdk.extension.incubator.fileconfig.ComposableRuleBasedSamplerFactory.DeclarativeConfigSamplingPredicate.toSpanParent; +import static io.opentelemetry.sdk.declarativeconfig.ComposableRuleBasedSamplerFactory.DeclarativeConfigSamplingPredicate.toSpanParent; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; @@ -23,18 +23,18 @@ import io.opentelemetry.common.ComponentLoader; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; -import io.opentelemetry.sdk.extension.incubator.fileconfig.ComposableRuleBasedSamplerFactory.AttributeMatcher; -import io.opentelemetry.sdk.extension.incubator.fileconfig.ComposableRuleBasedSamplerFactory.DeclarativeConfigSamplingPredicate; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableAlwaysOffSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableAlwaysOnSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableProbabilitySamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableRuleBasedSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleAttributePatternsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleAttributeValuesModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalSpanParent; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanKind; +import io.opentelemetry.sdk.declarativeconfig.ComposableRuleBasedSamplerFactory.AttributeMatcher; +import io.opentelemetry.sdk.declarativeconfig.ComposableRuleBasedSamplerFactory.DeclarativeConfigSamplingPredicate; +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/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigContextTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigContextTest.java similarity index 97% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigContextTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigContextTest.java index 71b9df870df..02fd943c11d 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigContextTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigContextTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.spy; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationBuilderTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationBuilderTest.java similarity index 98% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationBuilderTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationBuilderTest.java index d1abd33fcd9..a07b8580826 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationBuilderTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationBuilderTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCreateTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationCreateTest.java similarity index 94% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCreateTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationCreateTest.java index f1eb6a2e82b..80c82522d03 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCreateTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationCreateTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigTestUtil.createTempFileWithContent; +import static io.opentelemetry.sdk.declarativeconfig.FileConfigTestUtil.createTempFileWithContent; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -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.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanProcessorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel; import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk; import io.opentelemetry.sdk.trace.samplers.ParentBasedSamplerBuilder; import java.io.ByteArrayInputStream; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationParseTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationParseTest.java similarity index 94% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationParseTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationParseTest.java index aefc81c35a7..e575f0e4f17 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationParseTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/DeclarativeConfigurationParseTest.java @@ -3,24 +3,24 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AggregationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeNameValueModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchSpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ResourceModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TraceIdRatioBasedSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel; +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 java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.util.AbstractMap; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ExemplarFilterFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ExemplarFilterFactoryTest.java similarity index 88% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ExemplarFilterFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ExemplarFilterFactoryTest.java index 79fa0bbde45..33781c10a65 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ExemplarFilterFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ExemplarFilterFactoryTest.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.Mockito.mock; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MeterProviderModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.MeterProviderModel; import io.opentelemetry.sdk.metrics.ExemplarFilter; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigTestUtil.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/FileConfigTestUtil.java similarity index 88% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigTestUtil.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/FileConfigTestUtil.java index f98bf6e698c..cc2c042caaf 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/FileConfigTestUtil.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/FileConfigTestUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import java.io.IOException; import java.nio.file.Files; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/InstrumentSelectorFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/InstrumentSelectorFactoryTest.java similarity index 92% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/InstrumentSelectorFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/InstrumentSelectorFactoryTest.java index d0362c5e242..4e89b5a9a53 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/InstrumentSelectorFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/InstrumentSelectorFactoryTest.java @@ -3,14 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewSelectorModel; +import io.opentelemetry.sdk.declarativeconfig.internal.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/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogLimitsFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/LogLimitsFactoryTest.java similarity index 88% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogLimitsFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/LogLimitsFactoryTest.java index 5fab6df6d11..af7afa9c93e 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogLimitsFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/LogLimitsFactoryTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.Mockito.mock; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordLimitsModel; import io.opentelemetry.sdk.logs.LogLimits; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordExporterFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/LogRecordExporterFactoryTest.java similarity index 93% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordExporterFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/LogRecordExporterFactoryTest.java index d9e67056f06..15e9fe4291a 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordExporterFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/LogRecordExporterFactoryTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigTestUtil.createTempFileWithContent; +import static io.opentelemetry.sdk.declarativeconfig.FileConfigTestUtil.createTempFileWithContent; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -17,16 +17,16 @@ import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter; import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporter; import io.opentelemetry.internal.testing.CleanupExtension; -import io.opentelemetry.sdk.extension.incubator.fileconfig.component.LogRecordExporterComponentProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ConsoleExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalOtlpFileExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.GrpcTlsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.HttpTlsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.NameStringValuePairModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpGrpcExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel; +import io.opentelemetry.sdk.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.logs.export.LogRecordExporter; import java.io.Closeable; import java.io.IOException; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/LogRecordProcessorFactoryTest.java similarity index 89% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/LogRecordProcessorFactoryTest.java index 8a863f238f7..eaf184a1508 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/LogRecordProcessorFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -12,13 +12,13 @@ import io.opentelemetry.common.ComponentLoader; import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter; import io.opentelemetry.internal.testing.CleanupExtension; -import io.opentelemetry.sdk.extension.incubator.fileconfig.component.LogRecordProcessorComponentProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchLogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessorPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleLogRecordProcessorModel; +import io.opentelemetry.sdk.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.logs.LogRecordProcessor; import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor; import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/LoggerProviderFactoryTest.java similarity index 85% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/LoggerProviderFactoryTest.java index 3381b3ea5e5..d0ac544f8ba 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LoggerProviderFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/LoggerProviderFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.logs.internal.SdkLoggerProviderUtil.setLoggerConfigurator; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; @@ -14,17 +14,17 @@ import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchLogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLoggerConfigModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLoggerConfiguratorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLoggerMatcherAndConfigModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LoggerProviderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel.SeverityNumber; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel; +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/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/MeterProviderFactoryTest.java similarity index 80% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/MeterProviderFactoryTest.java index 1254b411992..94c0ee4b313 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MeterProviderFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/MeterProviderFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.metrics.internal.SdkMeterProviderUtil.setMeterConfigurator; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; @@ -13,17 +13,17 @@ import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalMeterConfigModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalMeterConfiguratorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalMeterMatcherAndConfigModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MeterProviderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PeriodicMetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewSelectorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel; +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/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricExporterFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/MetricExporterFactoryTest.java similarity index 94% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricExporterFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/MetricExporterFactoryTest.java index 62e48f337f7..4102a1f4ac1 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricExporterFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/MetricExporterFactoryTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigTestUtil.createTempFileWithContent; +import static io.opentelemetry.sdk.declarativeconfig.FileConfigTestUtil.createTempFileWithContent; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -17,16 +17,16 @@ import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter; import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter; import io.opentelemetry.internal.testing.CleanupExtension; -import io.opentelemetry.sdk.extension.incubator.fileconfig.component.MetricExporterComponentProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ConsoleMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalOtlpFileMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.GrpcTlsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.HttpTlsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.NameStringValuePairModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpGrpcMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterPropertyModel; +import io.opentelemetry.sdk.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.metrics.Aggregation; import io.opentelemetry.sdk.metrics.InstrumentType; import io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/MetricReaderFactoryTest.java similarity index 91% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/MetricReaderFactoryTest.java index 3882003aa8d..056e99c059d 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/MetricReaderFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/MetricReaderFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static java.util.Collections.singletonList; @@ -20,15 +20,15 @@ import io.opentelemetry.exporter.prometheus.PrometheusHttpServer; import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.CardinalityLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalPrometheusMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PeriodicMetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PullMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PullMetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterModel; +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/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/OpenTelemetryConfigurationFactoryTest.java similarity index 85% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/OpenTelemetryConfigurationFactoryTest.java index ef0e9fa49de..b88d84bfaae 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/OpenTelemetryConfigurationFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.trace.samplers.Sampler.alwaysOn; @@ -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.extension.incubator.fileconfig.internal.model.AlwaysOnSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeNameValueModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchLogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchSpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectionModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LoggerProviderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MeterProviderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PeriodicMetricReaderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PropagatorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PushMetricExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ResourceModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleLogRecordProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewSelectorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel; +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.internal.ExtendedOpenTelemetrySdk; import io.opentelemetry.sdk.internal.OpenTelemetrySdkBuilderUtil; import io.opentelemetry.sdk.internal.SdkConfigProvider; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/PropagatorFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/PropagatorFactoryTest.java similarity index 88% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/PropagatorFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/PropagatorFactoryTest.java index d3072f4aa31..44ae386559e 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/PropagatorFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/PropagatorFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -16,13 +16,13 @@ import io.opentelemetry.context.propagation.ContextPropagators; import io.opentelemetry.context.propagation.TextMapPropagator; import io.opentelemetry.extension.trace.propagation.B3Propagator; -import io.opentelemetry.sdk.extension.incubator.fileconfig.component.TextMapPropagatorComponentProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.B3MultiPropagatorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.B3PropagatorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BaggagePropagatorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.PropagatorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TextMapPropagatorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TraceContextPropagatorModel; +import io.opentelemetry.sdk.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 java.util.Arrays; import java.util.Collections; import java.util.stream.Stream; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ResourceFactoryTest.java similarity index 93% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ResourceFactoryTest.java index 58b1bd6e7f5..c80ab644f91 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ResourceFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ResourceFactoryTest.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.incubator.config.DeclarativeConfigException; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeNameValueModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectionModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalResourceDetectorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ResourceModel; +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 java.util.Arrays; import java.util.Collections; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/SamplerFactoryTest.java similarity index 86% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/SamplerFactoryTest.java index 52775f1abe4..6ef59cb0402 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SamplerFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/SamplerFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -12,20 +12,20 @@ import io.opentelemetry.common.ComponentLoader; import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; -import io.opentelemetry.sdk.extension.incubator.fileconfig.component.SamplerComponentProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AlwaysOffSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AlwaysOnSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableAlwaysOffSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableAlwaysOnSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableParentThresholdSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableProbabilitySamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableRuleBasedSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalComposableSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalJaegerRemoteSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ParentBasedSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerPropertyModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TraceIdRatioBasedSamplerModel; +import io.opentelemetry.sdk.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.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/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ServiceResourceDetectorTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ServiceResourceDetectorTest.java similarity index 97% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ServiceResourceDetectorTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ServiceResourceDetectorTest.java index 4778fe1b614..d2b33b23db4 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ServiceResourceDetectorTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ServiceResourceDetectorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanExporterFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/SpanExporterFactoryTest.java similarity index 94% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanExporterFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/SpanExporterFactoryTest.java index 906ced22056..50eabdc5fae 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanExporterFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/SpanExporterFactoryTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import static io.opentelemetry.sdk.extension.incubator.fileconfig.FileConfigTestUtil.createTempFileWithContent; +import static io.opentelemetry.sdk.declarativeconfig.FileConfigTestUtil.createTempFileWithContent; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -17,16 +17,16 @@ import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter; import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter; import io.opentelemetry.internal.testing.CleanupExtension; -import io.opentelemetry.sdk.extension.incubator.fileconfig.component.SpanExporterComponentProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ConsoleExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalOtlpFileExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.GrpcTlsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.HttpTlsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.NameStringValuePairModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpGrpcExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterPropertyModel; +import io.opentelemetry.sdk.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.trace.export.SpanExporter; import java.io.Closeable; import java.io.IOException; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanLimitsFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/SpanLimitsFactoryTest.java similarity index 90% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanLimitsFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/SpanLimitsFactoryTest.java index cfbec8b16eb..e5cdbf38965 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanLimitsFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/SpanLimitsFactoryTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.Mockito.mock; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeLimitsModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanLimitsModel; import io.opentelemetry.sdk.trace.SpanLimits; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/SpanProcessorFactoryTest.java similarity index 89% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/SpanProcessorFactoryTest.java index f56aedf746f..3f1b75f1f36 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/SpanProcessorFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -12,13 +12,13 @@ import io.opentelemetry.common.ComponentLoader; import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter; import io.opentelemetry.internal.testing.CleanupExtension; -import io.opentelemetry.sdk.extension.incubator.fileconfig.component.SpanProcessorComponentProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchSpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleSpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorPropertyModel; +import io.opentelemetry.sdk.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.trace.SpanProcessor; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TestDeclarativeConfigurationCustomizerProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/TestDeclarativeConfigurationCustomizerProvider.java similarity index 83% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TestDeclarativeConfigurationCustomizerProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/TestDeclarativeConfigurationCustomizerProvider.java index ac80fa388da..d34a3284ae3 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TestDeclarativeConfigurationCustomizerProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/TestDeclarativeConfigurationCustomizerProvider.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeNameValueModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ResourceModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.AttributeNameValueModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.ResourceModel; import java.util.ArrayList; import java.util.List; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/TracerProviderFactoryTest.java similarity index 82% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/TracerProviderFactoryTest.java index b2610d678b9..6a34e2be023 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/TracerProviderFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/TracerProviderFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.trace.samplers.Sampler.alwaysOn; @@ -13,18 +13,18 @@ import io.opentelemetry.internal.testing.CleanupExtension; import io.opentelemetry.sdk.common.internal.ScopeConfigurator; import io.opentelemetry.sdk.common.internal.ScopeConfiguratorBuilder; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AlwaysOnSamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AttributeLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchSpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalTracerConfigModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalTracerConfiguratorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalTracerMatcherAndConfigModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OtlpHttpExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanLimitsModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel; +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/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ViewFactoryTest.java similarity index 83% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactoryTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ViewFactoryTest.java index 1911c8fbbac..b7be4ca00c4 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/ViewFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/ViewFactoryTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.mockito.Mockito.mock; import io.opentelemetry.sdk.common.internal.IncludeExcludePredicate; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.AggregationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExplicitBucketHistogramAggregationModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.IncludeExcludeModel; -import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel; +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/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlDeclarativeConfigPropertiesTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/YamlDeclarativeConfigPropertiesTest.java similarity index 98% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlDeclarativeConfigPropertiesTest.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/YamlDeclarativeConfigPropertiesTest.java index e0443cd80b9..d8eeaf73551 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlDeclarativeConfigPropertiesTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/YamlDeclarativeConfigPropertiesTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig; +package io.opentelemetry.sdk.declarativeconfig; import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty; import static org.assertj.core.api.Assertions.assertThat; @@ -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.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ContainerResourceProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ContainerResourceProvider.java similarity index 92% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ContainerResourceProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ContainerResourceProvider.java index 8c56339f578..dd016bdad00 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ContainerResourceProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ContainerResourceProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/HostResourceProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/HostResourceProvider.java similarity index 92% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/HostResourceProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/HostResourceProvider.java index 7bff673457d..b1071a8eba2 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/HostResourceProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/HostResourceProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/LogRecordExporterComponentProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/LogRecordExporterComponentProvider.java similarity index 95% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/LogRecordExporterComponentProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/LogRecordExporterComponentProvider.java index cae58c59540..258ff4ec2fb 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/LogRecordExporterComponentProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/LogRecordExporterComponentProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/LogRecordProcessorComponentProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/LogRecordProcessorComponentProvider.java similarity index 94% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/LogRecordProcessorComponentProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/LogRecordProcessorComponentProvider.java index 28724787319..f314edfb556 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/LogRecordProcessorComponentProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/LogRecordProcessorComponentProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.context.Context; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/MetricExporterComponentProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/MetricExporterComponentProvider.java similarity index 96% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/MetricExporterComponentProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/MetricExporterComponentProvider.java index f0860d2fd48..e69119de6a9 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/MetricExporterComponentProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/MetricExporterComponentProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/OsResourceProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/OsResourceProvider.java similarity index 92% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/OsResourceProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/OsResourceProvider.java index a8a6801dca6..f97b4b2d2f4 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/OsResourceProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/OsResourceProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ProcessResourceProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ProcessResourceProvider.java similarity index 92% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ProcessResourceProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ProcessResourceProvider.java index 87718b791ba..45283d9efd5 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ProcessResourceProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ProcessResourceProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceComponentProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ResourceComponentProvider.java similarity index 90% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceComponentProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ResourceComponentProvider.java index f15d1919917..71b04fbd52a 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceComponentProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ResourceComponentProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceFirstComponentProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ResourceFirstComponentProvider.java similarity index 90% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceFirstComponentProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ResourceFirstComponentProvider.java index 565dc1c4f96..12681b18d9c 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceFirstComponentProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ResourceFirstComponentProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceSecondComponentProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ResourceSecondComponentProvider.java similarity index 90% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceSecondComponentProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ResourceSecondComponentProvider.java index f512e1e354f..1f5f8ecf0fb 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/ResourceSecondComponentProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/ResourceSecondComponentProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SamplerComponentProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/SamplerComponentProvider.java similarity index 95% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SamplerComponentProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/SamplerComponentProvider.java index e48a4a0ceab..85f8d5444f0 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SamplerComponentProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/SamplerComponentProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SpanExporterComponentProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/SpanExporterComponentProvider.java similarity index 95% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SpanExporterComponentProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/SpanExporterComponentProvider.java index f1068a082b8..ecd070ed7b5 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SpanExporterComponentProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/SpanExporterComponentProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SpanProcessorComponentProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/SpanProcessorComponentProvider.java similarity index 95% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SpanProcessorComponentProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/SpanProcessorComponentProvider.java index b42a4795ef6..bf6d4a04a69 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/SpanProcessorComponentProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/SpanProcessorComponentProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.context.Context; diff --git a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/TextMapPropagatorComponentProvider.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/TextMapPropagatorComponentProvider.java similarity index 95% rename from sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/TextMapPropagatorComponentProvider.java rename to sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/TextMapPropagatorComponentProvider.java index e87c64feec1..f72e6578562 100644 --- a/sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/component/TextMapPropagatorComponentProvider.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/declarativeconfig/component/TextMapPropagatorComponentProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extension.incubator.fileconfig.component; +package io.opentelemetry.sdk.declarativeconfig.component; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.context.Context; diff --git a/sdk-extensions/declarative-config/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/sdk-extensions/declarative-config/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider new file mode 100644 index 00000000000..691a8eebb56 --- /dev/null +++ b/sdk-extensions/declarative-config/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider @@ -0,0 +1,14 @@ +io.opentelemetry.sdk.declarativeconfig.component.MetricExporterComponentProvider +io.opentelemetry.sdk.declarativeconfig.component.SpanExporterComponentProvider +io.opentelemetry.sdk.declarativeconfig.component.LogRecordExporterComponentProvider +io.opentelemetry.sdk.declarativeconfig.component.TextMapPropagatorComponentProvider +io.opentelemetry.sdk.declarativeconfig.component.SamplerComponentProvider +io.opentelemetry.sdk.declarativeconfig.component.SpanProcessorComponentProvider +io.opentelemetry.sdk.declarativeconfig.component.LogRecordProcessorComponentProvider +io.opentelemetry.sdk.declarativeconfig.component.ResourceComponentProvider +io.opentelemetry.sdk.declarativeconfig.component.ResourceFirstComponentProvider +io.opentelemetry.sdk.declarativeconfig.component.ResourceSecondComponentProvider +io.opentelemetry.sdk.declarativeconfig.component.ContainerResourceProvider +io.opentelemetry.sdk.declarativeconfig.component.HostResourceProvider +io.opentelemetry.sdk.declarativeconfig.component.OsResourceProvider +io.opentelemetry.sdk.declarativeconfig.component.ProcessResourceProvider diff --git a/sdk-extensions/declarative-config/src/test/resources/META-INF/services/io.opentelemetry.sdk.declarativeconfig.DeclarativeConfigurationCustomizerProvider b/sdk-extensions/declarative-config/src/test/resources/META-INF/services/io.opentelemetry.sdk.declarativeconfig.DeclarativeConfigurationCustomizerProvider new file mode 100644 index 00000000000..f81f8a0d5b2 --- /dev/null +++ b/sdk-extensions/declarative-config/src/test/resources/META-INF/services/io.opentelemetry.sdk.declarativeconfig.DeclarativeConfigurationCustomizerProvider @@ -0,0 +1 @@ +io.opentelemetry.sdk.declarativeconfig.TestDeclarativeConfigurationCustomizerProvider diff --git a/sdk-extensions/incubator/README.md b/sdk-extensions/incubator/README.md index 8422c585f00..fbc181470d4 100644 --- a/sdk-extensions/incubator/README.md +++ b/sdk-extensions/incubator/README.md @@ -4,32 +4,8 @@ This artifact contains experimental code related to the trace and metric SDKs. ## Declarative Configuration -The [declarative configuration interface](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/README.md#declarative-configuration) allows for YAML based file configuration of `OpenTelemetrySdk`. - -Usage: - -```shell -File yamlConfigFile = new File("/path/to/config.yaml"); -OpenTelemetrySdk openTelemetrySdk; -try (FileInputStream yamlConfigFileInputStream = new FileInputStream("/path/to/config.yaml")) { - openTelemetrySdk = DeclarativeConfiguration.parseAndCreate(yamlConfigFileInputStream); -} -// ...proceed with application after successful initialization of OpenTelemetrySdk -``` - -Notes: -* Environment variable substitution is supported as [defined in the spec](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/data-model.md#environment-variable-substitution) -* Customization is limited to customizing the in-memory config model, or exporters. See `DeclarativeConfigurationCustomizer` SPI for details. -* Custom SDK extension components which reference the [ComponentProvider](https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/autoconfigure-spi/src/main/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ComponentProvider.java) SPI can be referenced in declarative configuration. Supported types include: - * `Resource` - * `SpanExporter` - * `MetricExporter` - * `LogRecordExporter` - * `SpanProcessor` - * `LogRecordProcessor` - * `TextMapPropagator` - * `Sampler` -* You can use declarative configuration with [autoconfigure](https://opentelemetry.io/docs/languages/java/configuration/#declarative-configuration) to specify a configuration file via environment variable, e.g. `OTEL_CONFIG_FILE=/path/to/config.yaml`. +> [!WARNING] +> Relocated to [opentelemetry-sdk-extensions-declarative-config](../declarative-config) ## View File Configuration diff --git a/sdk-extensions/incubator/build.gradle.kts b/sdk-extensions/incubator/build.gradle.kts index d6b686fb0be..573d93297fb 100644 --- a/sdk-extensions/incubator/build.gradle.kts +++ b/sdk-extensions/incubator/build.gradle.kts @@ -1,14 +1,8 @@ -import de.undercouch.gradle.tasks.download.Download -import java.io.FileFilter - plugins { id("otel.java-conventions") id("otel.publish-conventions") id("otel.animalsniffer-conventions") - - id("de.undercouch.download") - id("org.jsonschema2pojo") } // SDK modules that are still being developed. @@ -25,233 +19,8 @@ dependencies { implementation(project(":sdk-extensions:autoconfigure-spi")) implementation("org.snakeyaml:snakeyaml-engine") - // io.opentelemetry.sdk.extension.incubator.fileconfig - api(project(":api:incubator")) - implementation("com.fasterxml.jackson.core:jackson-databind") - api("com.fasterxml.jackson.core:jackson-annotations") - implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") - testImplementation(project(":sdk:testing")) testImplementation(project(":sdk-extensions:autoconfigure")) - testImplementation(project(":exporters:logging")) - testImplementation(project(":exporters:logging-otlp")) - testImplementation(project(":exporters:otlp:all")) - testImplementation(project(":exporters:prometheus")) - testImplementation(project(":sdk-extensions:jaeger-remote-sampler")) - testImplementation(project(":extensions:trace-propagators")) testImplementation("edu.berkeley.cs.jqf:jqf-fuzz") - testImplementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator") - testImplementation("com.linecorp.armeria:armeria-junit5") - testImplementation("com.google.guava:guava-testlib") } - -// The following tasks download the JSON Schema files from open-telemetry/opentelemetry-configuration and generate classes from the type definitions which are used with jackson-databind to parse JSON / YAML to the configuration schema. -// The sequence of tasks is: -// 1. downloadConfigurationSchema - download configuration schema from open-telemetry/opentelemetry-configuration -// 2. unzipConfigurationSchema - unzip the configuration schema archive contents to $buildDir/configuration/ -// 3. generateJsonSchema2Pojo - generate java POJOs from the configuration schema -// 4. jsonSchema2PojoPostProcessing - perform various post processing on the generated POJOs, e.g. replace javax.annotation.processing.Generated with javax.annotation.Generated, add @SuppressWarning("rawtypes") annotation -// 5. overwriteJs2p - overwrite original generated classes with versions containing updated @Generated annotation -// 6. deleteJs2pTmp - delete tmp directory -// ... proceed with normal sourcesJar, compileJava, etc - -val configurationTag = "1.0.0" -val configurationRef = "refs/tags/v$configurationTag" // Replace with commit SHA to point to experiment with a specific commit -val configurationRepoZip = "https://github.com/open-telemetry/opentelemetry-configuration/archive/$configurationRef.zip" -val buildDirectory = layout.buildDirectory.asFile.get() - -val downloadConfigurationSchema by tasks.registering(Download::class) { - src(configurationRepoZip) - // The version is encoded in the filename so that a configurationTag change results in a new - // path that doesn't yet exist, triggering a fresh download. On subsequent builds with the same - // tag the file already exists and overwrite(false) skips the network request. Note: the - // de.undercouch Download task always reports itself as not up-to-date, so overwrite(false) is - // the intended mechanism for avoiding redundant downloads. - // - // The zip is stored in tmp/ so it is outside the Sync task's output directory (configuration/). - dest("$buildDirectory/tmp/opentelemetry-configuration-v$configurationTag.zip") - overwrite(false) -} - -val unzipConfigurationSchema by tasks.registering(Sync::class) { - // Sync (not Copy) removes stale files from the destination when the source changes, ensuring - // files deleted or renamed between schema versions don't linger in the build dir. - dependsOn(downloadConfigurationSchema) - - from(zipTree(downloadConfigurationSchema.get().dest)) - eachFile(closureOf { - // Remove the top level folder "/opentelemetry-configuration-$configurationRef" - val pathParts = path.split("/") - path = pathParts.subList(1, pathParts.size).joinToString("/") - }) - into("$buildDirectory/configuration/") - includeEmptyDirs = false -} - -jsonSchema2Pojo { - sourceFiles = setOf(file("$buildDirectory/configuration/opentelemetry_configuration.json")) - targetDirectory = file("$buildDirectory/generated/sources/js2p/java/main") - targetPackage = "io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model" - - // Clear old source files to avoid contaminated source dir when updating - removeOldOutput = true - - // Include @Nullable annotation. Note: jsonSchmea2Pojo will not add @Nullable annotations on getters - // so we perform some steps in jsonSchema2PojoPostProcessing to add these. - includeJsr305Annotations = true - - // Prefer builders to setters - includeSetters = false - generateBuilders = true - - // Use title field to generate class name, instead of default which is based on filename / propertynames - useTitleAsClassname = true - - // Force java 9+ @Generated annotation, since java 8 @Generated annotation isn't detected by - // jsonSchema2Pojo and annotation is skipped altogether - targetVersion = "1.9" - - // Append Model as suffix to the generated classes. - classNameSuffix = "Model" -} - -val generateJsonSchema2Pojo = tasks.getByName("generateJsonSchema2Pojo") -generateJsonSchema2Pojo.dependsOn(unzipConfigurationSchema) - -val jsonSchema2PojoPostProcessing by tasks.registering(Copy::class) { - dependsOn(generateJsonSchema2Pojo) - - from("$buildDirectory/generated/sources/js2p") - into("$buildDirectory/generated/sources/js2p-tmp") - filter { - it - // Remove @Nullable annotation so it can be deterministically added later - .replace("import javax.annotation.Nullable;\n", "") - // Replace java 9+ @Generated annotation with java 8 version, add @Nullable annotation - .replace("import javax.annotation.processing.Generated;", "import javax.annotation.Nullable;\nimport javax.annotation.Generated;") - // Add @SuppressWarnings("rawtypes") annotation to address raw types used in jsonschema2pojo builders - .replace("@Generated(\"jsonschema2pojo\")", "@Generated(\"jsonschema2pojo\")\n@SuppressWarnings(\"rawtypes\")") - // Add @Nullable annotations to all getters - .replace("( *)public ([a-zA-Z]*) get([a-zA-Z]*)".toRegex(), "$1@Nullable\n$1public $2 get$3") - } -} -val overwriteJs2p by tasks.registering(Copy::class) { - dependsOn(jsonSchema2PojoPostProcessing) - - from("$buildDirectory/generated/sources/js2p-tmp") - into("$buildDirectory/generated/sources/js2p") -} -val deleteJs2pTmp by tasks.registering(Delete::class) { - dependsOn(overwriteJs2p) - - delete("$buildDirectory/generated/sources/js2p-tmp/") -} - -// 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 -// autoconfigure and without the risk of divergence from manual syncing. -val generatedResourceConfigDir = - layout.buildDirectory.dir("generated/sources/resource-configuration/java/main") -val copyResourceConfiguration by tasks.registering(Copy::class) { - from( - project(":sdk-extensions:autoconfigure").file( - "src/main/java/io/opentelemetry/sdk/autoconfigure/EnvironmentResource.java" - ) - ) - into(generatedResourceConfigDir.map { it.dir("io/opentelemetry/extension/incubator/fileconfig") }) - // Only the package declaration needs rewriting; everything else is copied verbatim. - filter { line: String -> - line.replace( - "package io.opentelemetry.sdk.autoconfigure;", - "package io.opentelemetry.sdk.extension.incubator.fileconfig;" - ) - } -} - -sourceSets { - main { - java { - srcDir(generatedResourceConfigDir) - } - } -} - -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" - ) - val sourcePackage = - "io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model" - val sourcePackagePath = sourcePackage.replace(".", "/") - val classesDir = - File( - buildDir, - "classes/java/main/$sourcePackagePath" - ) - - inputs.dir(classesDir) - outputs.file(targetFile) - - onlyIf { !targetFile.exists() } - - dependsOn("compileJava") - - doLast { - println("Generating GraalVM reflection config at: ${targetFile.absolutePath}") - - val classes = mutableListOf() - classesDir.walkTopDown().filter { it.isFile && it.extension == "class" }.forEach { file -> - val relativePath = file.toRelativeString(classesDir) - val className = relativePath - .removeSuffix(".class") - .replace(File.separatorChar, '.') - classes.add("$sourcePackage.$className") - } - classes.sort() - - targetFile.parentFile.mkdirs() - targetFile.bufferedWriter().use { writer -> - writer.write("[\n") - classes.forEachIndexed { index, className -> - writer.write(" {\n") - writer.write(" \"name\": \"$className\",\n") - writer.write(" \"allDeclaredMethods\": true,\n") - writer.write(" \"allDeclaredFields\": true,\n") - writer.write(" \"allDeclaredConstructors\": true\n") - writer.write(" }") - if (index < classes.size - 1) { - writer.write(",\n") - } else { - writer.write("\n") - } - } - writer.write("]\n") - } - } -} - -tasks.getByName("compileJava").dependsOn(deleteJs2pTmp, copyResourceConfiguration) -tasks.getByName("sourcesJar").dependsOn(deleteJs2pTmp, buildGraalVmReflectionJson, copyResourceConfiguration) -tasks.getByName("jar").dependsOn(deleteJs2pTmp, buildGraalVmReflectionJson) -tasks.getByName("javadoc").dependsOn(buildGraalVmReflectionJson) -tasks.getByName("compileTestJava").dependsOn(buildGraalVmReflectionJson) - -// Exclude jsonschema2pojo generated sources from checkstyle -tasks.named("checkstyleMain") { - dependsOn(buildGraalVmReflectionJson) - exclude("**/fileconfig/internal/model/**") -} - -tasks { - withType().configureEach { - environment( - mapOf( - // Expose the kitchen sink example file to tests - "CONFIG_REPO_ROOT" to "$buildDirectory/configuration" - ) - ) - } -} diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/metric/viewconfig/ViewConfig.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/metric/viewconfig/ViewConfig.java index 0bb2b360802..ec18190df9d 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/metric/viewconfig/ViewConfig.java +++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/metric/viewconfig/ViewConfig.java @@ -77,8 +77,8 @@ * @deprecated this mechanism is superseded by declarative config, which is now stable (spec and * schema at opentelemetry-configuration. - * Please uses {@link - * io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration#parseAndCreate(InputStream)} + * Please uses {@code + * io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration#parseAndCreate(InputStream)} * instead. */ @Deprecated diff --git a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/metric/viewconfig/ViewConfigCustomizer.java b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/metric/viewconfig/ViewConfigCustomizer.java index 76af81d7c12..13f5fbda742 100644 --- a/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/metric/viewconfig/ViewConfigCustomizer.java +++ b/sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/metric/viewconfig/ViewConfigCustomizer.java @@ -23,8 +23,8 @@ * @deprecated this mechanism is superseded by declarative config, which is now stable (spec and * schema at opentelemetry-configuration) - * and will be removed after the 1.62.0 release. Please uses {@link - * io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration#parseAndCreate(InputStream)} + * and will be removed after the 1.62.0 release. Please uses {@code + * io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration#parseAndCreate(InputStream)} * instead. */ @Deprecated diff --git a/sdk-extensions/incubator/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/sdk-extensions/incubator/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider deleted file mode 100644 index a1a361a5f37..00000000000 --- a/sdk-extensions/incubator/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider +++ /dev/null @@ -1 +0,0 @@ -io.opentelemetry.sdk.extension.incubator.fileconfig.ServiceResourceDetector diff --git a/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider deleted file mode 100644 index da5f7288070..00000000000 --- a/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider +++ /dev/null @@ -1,14 +0,0 @@ -io.opentelemetry.sdk.extension.incubator.fileconfig.component.MetricExporterComponentProvider -io.opentelemetry.sdk.extension.incubator.fileconfig.component.SpanExporterComponentProvider -io.opentelemetry.sdk.extension.incubator.fileconfig.component.LogRecordExporterComponentProvider -io.opentelemetry.sdk.extension.incubator.fileconfig.component.TextMapPropagatorComponentProvider -io.opentelemetry.sdk.extension.incubator.fileconfig.component.SamplerComponentProvider -io.opentelemetry.sdk.extension.incubator.fileconfig.component.SpanProcessorComponentProvider -io.opentelemetry.sdk.extension.incubator.fileconfig.component.LogRecordProcessorComponentProvider -io.opentelemetry.sdk.extension.incubator.fileconfig.component.ResourceComponentProvider -io.opentelemetry.sdk.extension.incubator.fileconfig.component.ResourceFirstComponentProvider -io.opentelemetry.sdk.extension.incubator.fileconfig.component.ResourceSecondComponentProvider -io.opentelemetry.sdk.extension.incubator.fileconfig.component.ContainerResourceProvider -io.opentelemetry.sdk.extension.incubator.fileconfig.component.HostResourceProvider -io.opentelemetry.sdk.extension.incubator.fileconfig.component.OsResourceProvider -io.opentelemetry.sdk.extension.incubator.fileconfig.component.ProcessResourceProvider diff --git a/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider b/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider deleted file mode 100644 index f60ca4e082e..00000000000 --- a/sdk-extensions/incubator/src/test/resources/META-INF/services/io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider +++ /dev/null @@ -1 +0,0 @@ -io.opentelemetry.sdk.extension.incubator.fileconfig.TestDeclarativeConfigurationCustomizerProvider diff --git a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts index 4855897ae24..d717723a862 100644 --- a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts +++ b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { api(project(":sdk:all")) compileOnly(project(":api:incubator")) compileOnly(project(":sdk-extensions:autoconfigure")) - compileOnly(project(":sdk-extensions:incubator")) + compileOnly(project(":sdk-extensions:declarative-config")) implementation(project(":sdk:all")) implementation(project(":exporters:common")) diff --git a/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/internal/JaegerRemoteSamplerComponentProvider.java b/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/internal/JaegerRemoteSamplerComponentProvider.java index d98379eeca5..4e2402bff48 100644 --- a/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/internal/JaegerRemoteSamplerComponentProvider.java +++ b/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/internal/JaegerRemoteSamplerComponentProvider.java @@ -8,7 +8,7 @@ import io.opentelemetry.api.incubator.config.DeclarativeConfigException; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; -import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration; +import io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration; import io.opentelemetry.sdk.extension.trace.jaeger.sampler.JaegerRemoteSampler; import io.opentelemetry.sdk.extension.trace.jaeger.sampler.JaegerRemoteSamplerBuilder; import io.opentelemetry.sdk.trace.samplers.Sampler; diff --git a/settings.gradle.kts b/settings.gradle.kts index 8ba7a5f6003..e626119ee6b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -67,6 +67,7 @@ include(":sdk:trace") include(":sdk:trace-shaded-deps") include(":sdk-extensions:autoconfigure") include(":sdk-extensions:autoconfigure-spi") +include(":sdk-extensions:declarative-config") include(":sdk-extensions:incubator") include(":sdk-extensions:jaeger-remote-sampler") include(":testing-internal") From db30767e739f25867108bad0c8a0eb3efc692b17 Mon Sep 17 00:00:00 2001 From: Jack Berg <34418638+jack-berg@users.noreply.github.com> Date: Wed, 15 Apr 2026 15:30:29 -0500 Subject: [PATCH 2/2] PR feedback --- README.md | 2 +- sdk-extensions/autoconfigure/build.gradle.kts | 1 - .../AutoConfiguredOpenTelemetrySdkBuilder.java | 6 +++--- .../sdk/autoconfigure/DeclarativeConfigUtil.java | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4fbb134f15d..b941bf2256c 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,7 @@ Extensions to the OpenTelemetry SDK. |-------------------------------------------------------------------------------|------------------------------------------------------------------------------------|-----------------------------------------------------|-------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | [SDK Autoconfigure](./sdk-extensions/autoconfigure) | Autoconfigure OpenTelemetry SDK from env vars, system properties, and SPI | `opentelemetry-sdk-extension-autoconfigure` | 1.61.0 | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure) | | [SDK Autoconfigure SPI](./sdk-extensions/autoconfigure-spi) | Service Provider Interface (SPI) definitions for autoconfigure | `opentelemetry-sdk-extension-autoconfigure-spi` | 1.61.0 | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure-spi.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure-spi) | -| [SDK Declarative Config](./sdk-extensions/jaeger-remote-sampler) | Declarative config implementation for YAML-based SDK configuration | `opentelemetry-sdk-extension-declarative-config` | TODO: add after first release | TODO: add after first release | +| [SDK Declarative Config](./sdk-extensions/declarative-config) | Declarative config implementation for YAML-based SDK configuration | `opentelemetry-sdk-extension-declarative-config` | TODO: add after first release | TODO: add after first release | | [SDK Jaeger Remote Sampler Extension](./sdk-extensions/jaeger-remote-sampler) | Sampler which obtains sampling configuration from remote Jaeger server | `opentelemetry-sdk-extension-jaeger-remote-sampler` | 1.61.0 | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-jaeger-remote-sampler.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-jaeger-remote-sampler) | | [SDK Incubator](./sdk-extensions/incubator) | SDK incubator, including YAML based view configuration, LeakDetectingSpanProcessor | `opentelemetry-sdk-extension-incubator` | 1.61.0-alpha | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-incubator.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-incubator) | diff --git a/sdk-extensions/autoconfigure/build.gradle.kts b/sdk-extensions/autoconfigure/build.gradle.kts index ac05db8b30c..7cbc98d3e3d 100644 --- a/sdk-extensions/autoconfigure/build.gradle.kts +++ b/sdk-extensions/autoconfigure/build.gradle.kts @@ -12,7 +12,6 @@ dependencies { compileOnly(project(":api:incubator")) compileOnly(project(":sdk-extensions:declarative-config")) - // compileOnly(project(":sdk-extensions:incubator")) annotationProcessor("com.google.auto.value:auto-value") diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java index 3726d42aaa2..28a0ff9dcd6 100644 --- a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java +++ b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java @@ -65,17 +65,17 @@ public final class AutoConfiguredOpenTelemetrySdkBuilder implements AutoConfigur private static final boolean DECLARATIVE_CONFIG_AVAILABLE; static { - boolean incubatorAvailable = false; + boolean declarativeConfigAvailable = false; try { Class.forName( "io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration", false, AutoConfiguredOpenTelemetrySdkBuilder.class.getClassLoader()); - incubatorAvailable = true; + declarativeConfigAvailable = true; } catch (ClassNotFoundException e) { // Not available } - DECLARATIVE_CONFIG_AVAILABLE = incubatorAvailable; + DECLARATIVE_CONFIG_AVAILABLE = declarativeConfigAvailable; } @Nullable private ConfigProperties config; 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 552952d70f6..826c6f85d29 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 @@ -24,7 +24,7 @@ * Utilities for interacting with ({@code * io.opentelemetry:opentelemetry-sdk-extension-declarative-config}, which is not guaranteed to be * present on the classpath. For all methods, callers MUST first separately reflectively confirm - * that the incubator is available on the classpath. + * that declarative config is available on the classpath. */ final class DeclarativeConfigUtil {