Skip to content

tests should also use ConfigPropertiesBackedConfigProvider #15805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trask merged 3 commits into from
Jan 9, 2026
Merged

tests should also use ConfigPropertiesBackedConfigProvider #15805

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abaa5ca
Revert "split tests to separate PR"
zeitlinger Jan 9, 2026
a0d9b13
pr review
zeitlinger Jan 9, 2026
08a23c2
pr review
zeitlinger Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions ...t/java/io/opentelemetry/javaagent/tooling/config/ConfigurationPropertiesSupplierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import static org.assertj.core.api.Assertions.assertThat;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
import io.opentelemetry.javaagent.tooling.OpenTelemetryInstaller;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
import java.io.IOException;
Expand Down Expand Up @@ -41,24 +41,45 @@ void setUp() {
void fileConfigOverwritesUserPropertiesSupplier(@TempDir Path tempDir) throws IOException {
// given
Path configFile = tempDir.resolve("test-config.properties");
Files.write(configFile, singleton("custom.key = 42"));
Files.write(configFile, singleton("otel.instrumentation.custom.key = 42"));
System.setProperty(ConfigurationFile.CONFIGURATION_FILE_PROPERTY, configFile.toString());

// when
AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
OpenTelemetryInstaller.installOpenTelemetrySdk(this.getClass().getClassLoader());

// then
assertThat(AutoConfigureUtil.getConfig(autoConfiguredSdk).getString("custom.key"))
assertThat(
DeclarativeConfigUtil.getInstrumentationConfig(
autoConfiguredSdk.getOpenTelemetrySdk(), "custom")
.getString("key"))
.isEqualTo("42");
}

// baseline for the test above to make sure UserCustomPropertiesSupplier
// is actually working
@SetSystemProperty(key = "otel.sdk.disabled", value = "true") // don't setup the SDK
@Test
void userPropertiesSupplier() {
// when
AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
OpenTelemetryInstaller.installOpenTelemetrySdk(this.getClass().getClassLoader());

// then
assertThat(
DeclarativeConfigUtil.getInstrumentationConfig(
autoConfiguredSdk.getOpenTelemetrySdk(), "custom")
.getString("key"))
.isEqualTo("123");
}

// SPI used in test
public static class UserCustomPropertiesSupplier implements AutoConfigurationCustomizerProvider {

@Override
public void customize(AutoConfigurationCustomizer autoConfiguration) {
autoConfiguration.addPropertiesSupplier(() -> singletonMap("custom.key", "123"));
autoConfiguration.addPropertiesSupplier(
() -> singletonMap("otel.instrumentation.custom.key", "123"));
}
}
}
Loading