Skip to content

Commit b60c2eb

Browse files
jack-bergjack-berg
committed
Extract declarative config to new opentelemetry-sdk-extension-decelarative-config module
1 parent ec002c3 commit b60c2eb

118 files changed

Lines changed: 724 additions & 699 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ Extensions to the OpenTelemetry SDK.
128128
|-------------------------------------------------------------------------------|------------------------------------------------------------------------------------|-----------------------------------------------------|-------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
129129
| [SDK Autoconfigure](./sdk-extensions/autoconfigure) | Autoconfigure OpenTelemetry SDK from env vars, system properties, and SPI | `opentelemetry-sdk-extension-autoconfigure` | <!--VERSION_STABLE-->1.60.1<!--/VERSION_STABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-autoconfigure) |
130130
| [SDK Autoconfigure SPI](./sdk-extensions/autoconfigure-spi) | Service Provider Interface (SPI) definitions for autoconfigure | `opentelemetry-sdk-extension-autoconfigure-spi` | <!--VERSION_STABLE-->1.60.1<!--/VERSION_STABLE--> | [![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) |
131+
| [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 |
131132
| [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` | <!--VERSION_STABLE-->1.60.1<!--/VERSION_STABLE--> | [![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) |
132133
| [SDK Incubator](./sdk-extensions/incubator) | SDK incubator, including YAML based view configuration, LeakDetectingSpanProcessor | `opentelemetry-sdk-extension-incubator` | <!--VERSION_UNSTABLE-->1.60.1-alpha<!--/VERSION_UNSTABLE--> | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-incubator.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-incubator) |
133134
</details>

‎all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ class NoSharedInternalCodeTest {
4646
"opentelemetry-sdk-trace",
4747
"opentelemetry-sdk-extension-autoconfigure",
4848
"opentelemetry-sdk-extension-autoconfigure-spi",
49+
"opentelemetry-sdk-extension-declarative-config",
4950
"opentelemetry-sdk-extension-incubator",
5051
"opentelemetry-sdk-extension-jaeger-remote-sampler",
5152
"opentelemetry-exporter-otlp",

‎api/incubator/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
annotationProcessor("com.google.auto.value:auto-value")
1919

2020
// To use parsed config file as input for InstrumentationConfigUtilTest
21-
testImplementation(project(":sdk-extensions:incubator"))
21+
testImplementation(project(":sdk-extensions:declarative-config"))
2222

2323
testImplementation(project(":sdk:testing"))
2424
testImplementation(project(":api:testing-internal"))
@@ -33,7 +33,7 @@ testing {
3333
register<JvmTestSuite>("testConvertToModel") {
3434
dependencies {
3535
implementation("com.fasterxml.jackson.core:jackson-databind")
36-
implementation(project(":sdk-extensions:incubator"))
36+
implementation(project(":sdk-extensions:declarative-config"))
3737
implementation(project(":sdk-extensions:autoconfigure"))
3838
implementation("com.google.guava:guava")
3939
}

‎api/incubator/src/test/java/io/opentelemetry/api/incubator/ExtendedOpenTelemetryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import io.opentelemetry.api.trace.TracerProvider;
2626
import io.opentelemetry.context.propagation.ContextPropagators;
2727
import io.opentelemetry.sdk.OpenTelemetrySdk;
28-
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
28+
import io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration;
2929
import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk;
3030
import io.opentelemetry.sdk.internal.SdkConfigProvider;
3131
import java.io.ByteArrayInputStream;

‎api/incubator/src/test/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtilTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import static org.assertj.core.api.Assertions.assertThat;
99

1010
import com.google.common.collect.ImmutableMap;
11-
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
12-
import io.opentelemetry.sdk.extension.incubator.fileconfig.YamlDeclarativeConfigProperties;
11+
import io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration;
12+
import io.opentelemetry.sdk.declarativeconfig.YamlDeclarativeConfigProperties;
1313
import io.opentelemetry.sdk.internal.SdkConfigProvider;
1414
import java.io.ByteArrayInputStream;
1515
import java.nio.charset.StandardCharsets;

‎api/incubator/src/testConvertToModel/java/io/opentelemetry/api/incubator/InstrumentationConfigUtilTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
import io.opentelemetry.api.incubator.config.ConfigProvider;
1515
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
1616
import io.opentelemetry.api.incubator.config.InstrumentationConfigUtil;
17-
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
18-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalInstrumentationModel;
19-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationModel;
20-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
21-
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
17+
import io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration;
18+
import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalInstrumentationModel;
19+
import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalLanguageSpecificInstrumentationModel;
20+
import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
21+
import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel;
2222
import io.opentelemetry.sdk.internal.SdkConfigProvider;
2323
import java.io.ByteArrayInputStream;
2424
import java.nio.charset.StandardCharsets;

‎integration-tests/graal-incubating/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
implementation(project(":sdk:testing"))
2525
implementation(project(":exporters:otlp:all"))
2626
implementation(project(":api:incubator"))
27-
implementation(project(":sdk-extensions:incubator"))
27+
implementation(project(":sdk-extensions:declarative-config"))
2828
}
2929

3030
// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.0

‎integration-tests/graal-incubating/src/test/java/io/opentelemetry/integrationtests/graal/IncubatingApiTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import io.opentelemetry.api.metrics.Meter;
2424
import io.opentelemetry.api.metrics.MeterProvider;
2525
import io.opentelemetry.api.trace.TracerProvider;
26-
import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
26+
import io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration;
2727
import io.opentelemetry.sdk.logs.SdkLoggerProvider;
2828
import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor;
2929
import io.opentelemetry.sdk.metrics.SdkMeterProvider;

‎sdk-extensions/autoconfigure/build.gradle.kts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ dependencies {
1111
api(project(":sdk-extensions:autoconfigure-spi"))
1212

1313
compileOnly(project(":api:incubator"))
14-
compileOnly(project(":sdk-extensions:incubator"))
14+
compileOnly(project(":sdk-extensions:declarative-config"))
15+
// compileOnly(project(":sdk-extensions:incubator"))
1516

1617
annotationProcessor("com.google.auto.value:auto-value")
1718

@@ -61,6 +62,7 @@ testing {
6162
implementation(project(":sdk:trace-shaded-deps"))
6263
implementation(project(":sdk-extensions:jaeger-remote-sampler"))
6364
implementation(project(":sdk-extensions:incubator"))
65+
implementation(project(":sdk-extensions:declarative-config"))
6466

6567
implementation("com.google.guava:guava")
6668
implementation("io.opentelemetry.proto:opentelemetry-proto")
@@ -85,7 +87,7 @@ testing {
8587
}
8688
register<JvmTestSuite>("testIncubating") {
8789
dependencies {
88-
implementation(project(":sdk-extensions:incubator"))
90+
implementation(project(":sdk-extensions:declarative-config"))
8991
implementation(project(":exporters:logging"))
9092
implementation(project(":exporters:otlp:all"))
9193
implementation(project(":sdk:testing"))
@@ -98,7 +100,7 @@ testing {
98100

99101
register<JvmTestSuite>("testDeclarativeConfigSpi") {
100102
dependencies {
101-
implementation(project(":sdk-extensions:incubator"))
103+
implementation(project(":sdk-extensions:declarative-config"))
102104
implementation(project(":exporters:logging"))
103105
implementation(project(":sdk:testing"))
104106
}

‎sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,20 @@ public final class AutoConfiguredOpenTelemetrySdkBuilder implements AutoConfigur
6262

6363
private static final Logger logger =
6464
Logger.getLogger(AutoConfiguredOpenTelemetrySdkBuilder.class.getName());
65-
private static final boolean INCUBATOR_AVAILABLE;
65+
private static final boolean DECLARATIVE_CONFIG_AVAILABLE;
6666

6767
static {
6868
boolean incubatorAvailable = false;
6969
try {
7070
Class.forName(
71-
"io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration",
71+
"io.opentelemetry.sdk.declarativeconfig.DeclarativeConfiguration",
7272
false,
7373
AutoConfiguredOpenTelemetrySdkBuilder.class.getClassLoader());
7474
incubatorAvailable = true;
7575
} catch (ClassNotFoundException e) {
7676
// Not available
7777
}
78-
INCUBATOR_AVAILABLE = incubatorAvailable;
78+
DECLARATIVE_CONFIG_AVAILABLE = incubatorAvailable;
7979
}
8080

8181
@Nullable private ConfigProperties config;
@@ -571,10 +571,10 @@ void configureSdk(
571571
@Nullable
572572
private static AutoConfiguredOpenTelemetrySdk maybeConfigureFromFile(
573573
ConfigProperties config, ComponentLoader componentLoader) {
574-
if (INCUBATOR_AVAILABLE) {
575-
AutoConfiguredOpenTelemetrySdk sdk = IncubatingUtil.configureFromSpi(componentLoader);
574+
if (DECLARATIVE_CONFIG_AVAILABLE) {
575+
AutoConfiguredOpenTelemetrySdk sdk = DeclarativeConfigUtil.configureFromSpi(componentLoader);
576576
if (sdk != null) {
577-
logger.fine("Autoconfigured from SPI by opentelemetry-sdk-extension-incubator");
577+
logger.fine("Autoconfigured from SPI by opentelemetry-sdk-extension-declarative-config");
578578
return sdk;
579579
}
580580
}
@@ -591,11 +591,11 @@ private static AutoConfiguredOpenTelemetrySdk maybeConfigureFromFile(
591591
return null;
592592
}
593593

594-
if (!INCUBATOR_AVAILABLE) {
594+
if (!DECLARATIVE_CONFIG_AVAILABLE) {
595595
throw new ConfigurationException(
596-
"Cannot autoconfigure from config file without opentelemetry-sdk-extension-incubator on the classpath");
596+
"Cannot autoconfigure from config file without opentelemetry-sdk-extension-declarative-config on the classpath");
597597
}
598-
return IncubatingUtil.configureFromFile(logger, configurationFile, componentLoader);
598+
return DeclarativeConfigUtil.configureFromFile(logger, configurationFile, componentLoader);
599599
}
600600

601601
private void maybeRegisterShutdownHook(OpenTelemetrySdk openTelemetrySdk) {

0 commit comments

Comments
 (0)