Skip to content

Commit fcbe977

Browse files
committed
fix tests and experimental features
1 parent 61bbb70 commit fcbe977

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ public final class ConfigDefaults {
242242

243243
static final Set<String> DEFAULT_TRACE_EXPERIMENTAL_FEATURES_ENABLED =
244244
new HashSet<>(
245-
asList("DD_TAGS", "DD_LOGS_INJECTION", "EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED"));
245+
asList("DD_TAGS", "DD_LOGS_INJECTION", "DD_EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED"));
246246

247247
static final boolean DEFAULT_TRACE_128_BIT_TRACEID_GENERATION_ENABLED = true;
248248
static final boolean DEFAULT_TRACE_128_BIT_TRACEID_LOGGING_ENABLED = true;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1938,7 +1938,7 @@ class ConfigTest extends DDSpecification {
19381938
def config = new Config()
19391939

19401940
then:
1941-
config.experimentalFeaturesEnabled == ["DD_TAGS", "DD_LOGS_INJECTION"].toSet()
1941+
config.experimentalFeaturesEnabled == ["DD_TAGS", "DD_LOGS_INJECTION", "DD_EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED"].toSet()
19421942
}
19431943

19441944
def "detect if agent is configured using default values"() {

utils/test-utils/src/main/groovy/datadog/trace/test/util/DDSpecification.groovy

+4-4
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ abstract class DDSpecification extends Specification {
9090

9191
void setupSpec() {
9292
assert !configModificationFailed: "Config class modification failed. Ensure all test classes extend DDSpecification"
93-
// // assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
93+
assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
9494
assert systemPropertiesExceptAllowed().findAll { it.key.toString().startsWith("dd.") }.isEmpty()
9595

9696
if (getDDThreads().isEmpty()) {
@@ -106,7 +106,7 @@ abstract class DDSpecification extends Specification {
106106
void cleanupSpec() {
107107
restoreProperties()
108108

109-
// // assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
109+
assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
110110
assert systemPropertiesExceptAllowed().findAll { it.key.toString().startsWith("dd.") }.isEmpty()
111111

112112
if (isConfigInstanceModifiable) {
@@ -129,7 +129,7 @@ abstract class DDSpecification extends Specification {
129129
void setup() {
130130
restoreProperties()
131131

132-
// // assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
132+
assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
133133
assert systemPropertiesExceptAllowed().findAll { it.key.toString().startsWith("dd.") }.isEmpty()
134134

135135
if (isConfigInstanceModifiable) {
@@ -140,7 +140,7 @@ abstract class DDSpecification extends Specification {
140140
void cleanup() {
141141
restoreProperties()
142142

143-
// // assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
143+
assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
144144
assert systemPropertiesExceptAllowed().findAll { it.key.toString().startsWith("dd.") }.isEmpty()
145145

146146
if (isConfigInstanceModifiable) {

0 commit comments

Comments
 (0)