Skip to content

Commit c1b9621

Browse files
committed
updating tests
1 parent 9470b15 commit c1b9621

File tree

3 files changed

+7
-26
lines changed

3 files changed

+7
-26
lines changed

internal-api/src/main/java/datadog/trace/api/Config.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,8 @@
652652
import datadog.trace.api.profiling.ProfilingEnablement;
653653
import datadog.trace.api.rum.RumInjectorConfig;
654654
import datadog.trace.api.rum.RumInjectorConfig.PrivacyLevel;
655+
import datadog.trace.api.telemetry.ConfigInversionMetricCollectorImpl;
656+
import datadog.trace.api.telemetry.ConfigInversionMetricCollectorProvider;
655657
import datadog.trace.api.telemetry.OtelEnvMetricCollectorImpl;
656658
import datadog.trace.api.telemetry.OtelEnvMetricCollectorProvider;
657659
import datadog.trace.bootstrap.config.provider.CapturedEnvironmentConfigSource;
@@ -1245,6 +1247,7 @@ public static String getHostName() {
12451247
static {
12461248
// Bind telemetry collector to config module before initializing ConfigProvider
12471249
OtelEnvMetricCollectorProvider.register(OtelEnvMetricCollectorImpl.getInstance());
1250+
ConfigInversionMetricCollectorProvider.register(ConfigInversionMetricCollectorImpl.getInstance());
12481251
}
12491252

12501253
// Read order: System Properties -> Env Variables, [-> properties file], [-> default value]

utils/config-utils/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollectorProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ private ConfigInversionMetricCollectorProvider() {}
77

88
public static ConfigInversionMetricCollector get() {
99
if (INSTANCE == null) {
10-
throw new IllegalStateException("OtelEnvMetricCollectorService has not been registered.");
10+
throw new IllegalStateException("ConfigInversionMetricCollectorService has not been registered.");
1111
}
1212
return INSTANCE;
1313
}

utils/config-utils/src/test/java/datadog/trace/config/inversion/ConfigHelperTest.java

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import java.util.List;
1313
import java.util.Map;
1414
import java.util.Set;
15+
16+
import datadog.trace.api.telemetry.ConfigInversionMetricCollectorProvider;
1517
import org.junit.jupiter.api.AfterAll;
1618
import org.junit.jupiter.api.BeforeAll;
1719
import org.junit.jupiter.api.Test;
@@ -41,6 +43,7 @@ public class ConfigHelperTest {
4143
@BeforeAll
4244
static void setUp() {
4345
// Set up test configurations using SupportedConfigurationSource
46+
// ConfigInversionMetricCollectorProvider.register(ConfigInversionMetricCollectorImpl.getInstance());
4447
Set<String> testSupported =
4548
new HashSet<>(Arrays.asList(TEST_DD_VAR, TEST_OTEL_VAR, TEST_REGULAR_VAR));
4649

@@ -118,18 +121,6 @@ void testMainConfigPrecedence() {
118121
setEnvVar(ALIAS_DD_VAR, null);
119122
}
120123

121-
@Test
122-
void testUnsupportedDDEnvironmentVariable() {
123-
setEnvVar(UNSUPPORTED_DD_VAR, "");
124-
125-
assertNull(ConfigHelper.getEnvironmentVariable(UNSUPPORTED_DD_VAR));
126-
Map<String, String> result = ConfigHelper.getEnvironmentVariables();
127-
assertFalse(result.containsKey(UNSUPPORTED_DD_VAR));
128-
129-
// Cleanup
130-
setEnvVar(UNSUPPORTED_DD_VAR, null);
131-
}
132-
133124
@Test
134125
void testNonDDAliases() {
135126
setEnvVar(NON_DD_ALIAS_VAR, NON_DD_ALIAS_VAL);
@@ -149,19 +140,6 @@ void testAliasesWithoutPresentAliases() {
149140
assertFalse(result.containsKey(ALIAS_DD_VAR));
150141
}
151142

152-
@Test
153-
void testUnsupportedButNotStrict() {
154-
ConfigHelper.setConfigInversionStrict(ConfigInversionStrictStyle.WARNING);
155-
setEnvVar(UNSUPPORTED_DD_VAR, "loose");
156-
157-
// Should fall through and return the env var even though it's unsupported
158-
assertEquals("loose", ConfigHelper.getEnvironmentVariable(UNSUPPORTED_DD_VAR));
159-
160-
// Cleanup
161-
ConfigHelper.setConfigInversionStrict(ConfigInversionStrictStyle.STRICT);
162-
setEnvVar(UNSUPPORTED_DD_VAR, null);
163-
}
164-
165143
@Test
166144
void testAliasWithEmptyList() {
167145
Map<String, List<String>> aliasMap = new HashMap<>();

0 commit comments

Comments
 (0)