From 98905d43ddb22fc7d0b7f1a9f354d3c8b4971400 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 20 Feb 2025 19:17:09 +0200 Subject: [PATCH] Fix flaky test --- .../javaagent/tooling/config/ConfigurationFile.java | 5 +++++ .../tooling/config/ConfigurationPropertiesSupplierTest.java | 1 + 2 files changed, 6 insertions(+) diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigurationFile.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigurationFile.java index 726540783f95..4da9ca45f1fb 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigurationFile.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigurationFile.java @@ -39,6 +39,11 @@ static Map getProperties() { return configFileContents; } + // visible for tests + static void resetForTest() { + configFileContents = null; + } + // visible for tests static Map loadConfigFile() { // Reading from system property first and from env after diff --git a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationPropertiesSupplierTest.java b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationPropertiesSupplierTest.java index d8807beb2da8..d2083b45933b 100644 --- a/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationPropertiesSupplierTest.java +++ b/javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationPropertiesSupplierTest.java @@ -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