Skip to content

Commit 0636d0d

Browse files
authored
[Java] Enable Round 2 Config Consistency system-tests (#4370)
1 parent 92748b9 commit 0636d0d

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

manifests/java.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1727,7 +1727,7 @@ tests/:
17271727
test_config_consistency.py:
17281728
Test_Config_Dogstatsd: missing_feature (default hostname is inconsistent)
17291729
Test_Config_RateLimit: v1.41.1
1730-
Test_Config_Tags: missing_feature
1730+
Test_Config_Tags: v1.48.0
17311731
Test_Config_TraceAgentURL: v1.41.1
17321732
Test_Config_TraceEnabled: v1.39.0
17331733
Test_Config_TraceLogDirectory: missing_feature
@@ -1842,16 +1842,16 @@ tests/:
18421842
spring-boot: v1.42.0
18431843
Test_Config_LogInjection_128Bit_TraceId_Disabled:
18441844
'*': incomplete_test_app (weblog endpoint not implemented)
1845-
'spring-boot-3-native': missing_feature
1845+
'spring-boot-3-native': v1.48.0
18461846
Test_Config_LogInjection_128Bit_TraceId_Enabled:
18471847
'*': incomplete_test_app (weblog endpoint not implemented)
1848-
'spring-boot-3-native': missing_feature
1848+
'spring-boot-3-native': v1.48.0
18491849
Test_Config_LogInjection_Default:
18501850
'*': incomplete_test_app (weblog endpoint not implemented)
1851-
'spring-boot-3-native': missing_feature
1851+
'spring-boot-3-native': v1.48.0
18521852
Test_Config_LogInjection_Enabled:
18531853
'*': incomplete_test_app (weblog endpoint not implemented)
1854-
'spring-boot-3-native': missing_feature
1854+
'spring-boot-3-native': v1.48.0
18551855
Test_Config_ObfuscationQueryStringRegexp_Configured: v1.39.0
18561856
Test_Config_ObfuscationQueryStringRegexp_Default: v1.39.0
18571857
Test_Config_ObfuscationQueryStringRegexp_Empty: v1.39.0

tests/test_config_consistency.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,10 @@ def test_log_injection_enabled(self):
526526
assert field in msg, f"Missing field: {field}"
527527

528528

529+
# Using TRACING_CONFIG_NONDEFAULT_2 for dd-trace-java since the default value is under the DD_TRACE_EXPERIMENTAL_FEATURES_ENABLED
530+
# TODO: Change scenarios back to DEFAULT once all libraries change it to true
529531
@rfc("https://docs.google.com/document/d/1kI-gTAKghfcwI7YzKhqRv2ExUstcHqADIWA4-TZ387o/edit#heading=h.8v16cioi7qxp")
530-
@scenarios.default
532+
@scenarios.tracing_config_nondefault_2
531533
@features.log_injection
532534
class Test_Config_LogInjection_Default:
533535
"""Verify log injection is disabled by default"""

utils/_context/_scenarios/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,7 @@ class _Scenarios:
593593
"DD_TRACE_CLIENT_IP_ENABLED": "true",
594594
"DD_TRACE_PROPAGATION_STYLE_EXTRACT": "datadog,tracecontext,b3multi,baggage",
595595
"DD_TRACE_PROPAGATION_BEHAVIOR_EXTRACT": "ignore",
596+
"DD_TRACE_EXPERIMENTAL_FEATURES_ENABLED": "DD_LOGS_INJECTION", # Test false default value in dd-trace-java
596597
},
597598
include_kafka=True,
598599
include_postgres_db=True,

0 commit comments

Comments
 (0)