Skip to content

Commit 6fe209e

Browse files
committed
updating strictness of config tests
1 parent 9329e98 commit 6fe209e

File tree

4 files changed

+67
-0
lines changed

4 files changed

+67
-0
lines changed

internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ import static datadog.trace.api.config.TracerConfig.TRACE_SAMPLING_OPERATION_RUL
137137
import static datadog.trace.api.config.TracerConfig.TRACE_SAMPLING_SERVICE_RULES
138138
import static datadog.trace.api.config.TracerConfig.TRACE_X_DATADOG_TAGS_MAX_LENGTH
139139
import static datadog.trace.api.config.TracerConfig.WRITER_TYPE
140+
import datadog.trace.config.inversion.ConfigHelper
140141

141142
class ConfigTest extends DDSpecification {
142143
private static final String PREFIX = "dd."
@@ -883,6 +884,9 @@ class ConfigTest extends DDSpecification {
883884

884885
def "verify rule config #name"() {
885886
setup:
887+
def strictness = ConfigHelper.get().configInversionStrictFlag()
888+
ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
889+
886890
environmentVariables.set("DD_TRACE_TEST_ENABLED", "true")
887891
environmentVariables.set("DD_TRACE_TEST_ENV_ENABLED", "true")
888892
environmentVariables.set("DD_TRACE_DISABLED_ENV_ENABLED", "false")
@@ -894,6 +898,9 @@ class ConfigTest extends DDSpecification {
894898
expect:
895899
Config.get().isRuleEnabled(name) == enabled
896900

901+
cleanup:
902+
ConfigHelper.get().setConfigInversionStrict(strictness)
903+
897904
where:
898905
// spotless:off
899906
name | enabled
@@ -914,6 +921,9 @@ class ConfigTest extends DDSpecification {
914921

915922
def "verify integration jmxfetch config"() {
916923
setup:
924+
def strictness = ConfigHelper.get().configInversionStrictFlag()
925+
ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
926+
917927
environmentVariables.set("DD_JMXFETCH_ORDER_ENABLED", "false")
918928
environmentVariables.set("DD_JMXFETCH_TEST_ENV_ENABLED", "true")
919929
environmentVariables.set("DD_JMXFETCH_DISABLED_ENV_ENABLED", "false")
@@ -925,6 +935,9 @@ class ConfigTest extends DDSpecification {
925935
expect:
926936
Config.get().isJmxFetchIntegrationEnabled(integrationNames, defaultEnabled) == expected
927937

938+
cleanup:
939+
ConfigHelper.get().setConfigInversionStrict(strictness)
940+
928941
where:
929942
// spotless:off
930943
names | defaultEnabled | expected
@@ -950,6 +963,9 @@ class ConfigTest extends DDSpecification {
950963

951964
def "verify integration trace analytics config"() {
952965
setup:
966+
def strictness = ConfigHelper.get().configInversionStrictFlag()
967+
ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
968+
953969
environmentVariables.set("DD_ORDER_ANALYTICS_ENABLED", "false")
954970
environmentVariables.set("DD_TEST_ENV_ANALYTICS_ENABLED", "true")
955971
environmentVariables.set("DD_DISABLED_ENV_ANALYTICS_ENABLED", "false")
@@ -967,6 +983,9 @@ class ConfigTest extends DDSpecification {
967983
expect:
968984
Config.get().isTraceAnalyticsIntegrationEnabled(integrationNames, defaultEnabled) == expected
969985

986+
cleanup:
987+
ConfigHelper.get().setConfigInversionStrict(strictness)
988+
970989
where:
971990
// spotless:off
972991
names | defaultEnabled | expected
@@ -996,6 +1015,9 @@ class ConfigTest extends DDSpecification {
9961015

9971016
def "test getFloatSettingFromEnvironment(#name)"() {
9981017
setup:
1018+
def strictness = ConfigHelper.get().configInversionStrictFlag()
1019+
ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
1020+
9991021
environmentVariables.set("DD_ENV_ZERO_TEST", "0.0")
10001022
environmentVariables.set("DD_ENV_FLOAT_TEST", "1.0")
10011023
environmentVariables.set("DD_FLOAT_TEST", "0.2")
@@ -1009,6 +1031,9 @@ class ConfigTest extends DDSpecification {
10091031
expect:
10101032
Config.get().configProvider.getFloat(name, defaultValue) == (float) expected
10111033
1034+
cleanup:
1035+
ConfigHelper.get().setConfigInversionStrict(strictness)
1036+
10121037
where:
10131038
name | expected
10141039
// spotless:off
@@ -1027,6 +1052,9 @@ class ConfigTest extends DDSpecification {
10271052
10281053
def "test getDoubleSettingFromEnvironment(#name)"() {
10291054
setup:
1055+
def strictness = ConfigHelper.get().configInversionStrictFlag()
1056+
ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
1057+
10301058
environmentVariables.set("DD_ENV_ZERO_TEST", "0.0")
10311059
environmentVariables.set("DD_ENV_FLOAT_TEST", "1.0")
10321060
environmentVariables.set("DD_FLOAT_TEST", "0.2")
@@ -1040,6 +1068,9 @@ class ConfigTest extends DDSpecification {
10401068
expect:
10411069
Config.get().configProvider.getDouble(name, defaultValue) == (double) expected
10421070
1071+
cleanup:
1072+
ConfigHelper.get().setConfigInversionStrict(strictness)
1073+
10431074
where:
10441075
// spotless:off
10451076
name | expected

internal-api/src/test/groovy/datadog/trace/api/InstrumenterConfigTest.groovy

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
11
package datadog.trace.api
22

3+
import datadog.trace.config.inversion.ConfigHelper
34
import datadog.trace.test.util.DDSpecification
45

56
class InstrumenterConfigTest extends DDSpecification {
67

8+
def strictness
9+
10+
def setup(){
11+
strictness = ConfigHelper.get().configInversionStrictFlag()
12+
ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
13+
}
14+
15+
def cleanup(){
16+
ConfigHelper.get().setConfigInversionStrict(strictness)
17+
}
18+
719
def "verify integration config"() {
820
setup:
921
environmentVariables.set("DD_INTEGRATION_ORDER_ENABLED", "false")

internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/ConfigProviderTest.groovy

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import spock.lang.Shared
55
import datadog.trace.api.ConfigCollector
66
import datadog.trace.api.ConfigOrigin
77
import datadog.trace.api.ConfigSetting
8+
import datadog.trace.config.inversion.ConfigHelper
9+
810

911
import static datadog.trace.api.config.TracerConfig.TRACE_HTTP_SERVER_PATH_RESOURCE_NAME_MAPPING
1012

@@ -13,6 +15,17 @@ class ConfigProviderTest extends DDSpecification {
1315
@Shared
1416
ConfigProvider configProvider = ConfigProvider.withoutCollector()
1517

18+
def strictness
19+
20+
def setup(){
21+
strictness = ConfigHelper.get().configInversionStrictFlag()
22+
ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
23+
}
24+
25+
def cleanup() {
26+
ConfigHelper.get().setConfigInversionStrict(strictness)
27+
}
28+
1629
def "properties take precedence over env vars for ordered map"() {
1730
setup:
1831
injectEnvConfig("TRACE_HTTP_SERVER_PATH_RESOURCE_NAME_MAPPING", "/a:env,/b:env")

internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/StableConfigParserTest.groovy

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,20 @@ package datadog.trace.bootstrap.config.provider
22
import datadog.trace.test.util.DDSpecification
33
import java.nio.file.Files
44
import java.nio.file.Path
5+
import datadog.trace.config.inversion.ConfigHelper
56

67
class StableConfigParserTest extends DDSpecification {
78

9+
def strictness
10+
11+
def setup(){
12+
strictness = ConfigHelper.get().configInversionStrictFlag()
13+
ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
14+
}
15+
16+
def cleanup(){
17+
ConfigHelper.get().setConfigInversionStrict(strictness)
18+
}
819
def "test parse valid"() {
920
when:
1021
Path filePath = Files.createTempFile("testFile_", ".yaml")

0 commit comments

Comments
 (0)