Skip to content

Fix flaky test #13358

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
laurit merged 1 commit into from
Feb 20, 2025
Merged

Fix flaky test #13358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions ...nt-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigurationFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ static Map<String, String> getProperties() {
return configFileContents;
}

// visible for tests
static void resetForTest() {
configFileContents = null;
}

// visible for tests
static Map<String, String> loadConfigFile() {
// Reading from system property first and from env after
Expand Down
1 change: 1 addition & 0 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 @@ -32,6 +32,7 @@ class ConfigurationPropertiesSupplierTest {
@AfterAll
static void cleanUp() {
GlobalOpenTelemetry.resetForTest();
ConfigurationFile.resetForTest();
}

// regression for https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6696
Expand Down
Loading