@@ -137,6 +137,7 @@ import static datadog.trace.api.config.TracerConfig.TRACE_SAMPLING_OPERATION_RUL
137137import static datadog.trace.api.config.TracerConfig.TRACE_SAMPLING_SERVICE_RULES
138138import static datadog.trace.api.config.TracerConfig.TRACE_X_DATADOG_TAGS_MAX_LENGTH
139139import static datadog.trace.api.config.TracerConfig.WRITER_TYPE
140+ import datadog.trace.config.inversion.ConfigHelper
140141
141142class 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
0 commit comments