DD_IAST_USE_ROOT_SPAN disabled by default

Author: florentinl

tests/appsec/iast/aspects/test_add_aspect.py

@@ -343,7 +343,7 @@ def test_propagate_ranges_with_no_context(caplog):
     )
 
     reset_context()
-    with override_global_config(dict(_iast_debug=True, _iast_use_root_span=False)), caplog.at_level(logging.DEBUG):
+    with override_global_config(dict(_iast_debug=True)), caplog.at_level(logging.DEBUG):
         result_2 = add_aspect(result, "another_string")
 
     create_context()

tests/appsec/iast/conftest.py

@@ -111,7 +111,7 @@ def check_native_code_exception_in_each_python_aspect_test(request, caplog):
     if "skip_iast_check_logs" in request.keywords:
         yield
     else:
-        with override_global_config(dict(_iast_debug=True, _iast_use_root_span=False)), caplog.at_level(logging.DEBUG):
+        with override_global_config(dict(_iast_debug=True)), caplog.at_level(logging.DEBUG):
             yield
 
         for record in caplog.get_records("call"):

tests/appsec/iast/taint_tracking/test_native_taint_range.py

@@ -572,7 +572,7 @@ def test_race_conditions_reset_contexts_threads(caplog, telemetry_writer):
     """we want to validate context is working correctly among multiple request and no race condition creating and
     destroying contexts
     """
-    with override_global_config(dict(_iast_debug=True, _iast_use_root_span=False)), caplog.at_level(logging.DEBUG):
+    with override_global_config(dict(_iast_debug=True)), caplog.at_level(logging.DEBUG):
         pool = ThreadPool(processes=3)
         results_async = [pool.apply_async(reset_contexts_loop) for _ in range(20)]
         _ = [res.get() for res in results_async]

tests/appsec/iast/taint_tracking/test_taint_tracking.py

@@ -69,7 +69,7 @@ def test_taint_object_with_no_context_should_be_noop():
 @pytest.mark.skip_iast_check_logs
 def test_propagate_ranges_with_no_context(caplog):
     reset_context()
-    with override_global_config(dict(_iast_debug=True, _iast_use_root_span=False)), caplog.at_level(logging.DEBUG):
+    with override_global_config(dict(_iast_debug=True)), caplog.at_level(logging.DEBUG):
         string_input = taint_pyobject(
             pyobject="abcde", source_name="abcde", source_value="abcde", source_origin=OriginType.PARAMETER
         )

tests/appsec/integrations/fastapi_tests/test_fastapi_appsec_iast.py

@@ -95,7 +95,7 @@ def check_native_code_exception_in_each_fastapi_test(request, caplog, telemetry_
         yield
     else:
         caplog.set_level(logging.DEBUG)
-        with override_global_config(dict(_iast_debug=True, _iast_use_root_span=False)), caplog.at_level(logging.DEBUG):
+        with override_global_config(dict(_iast_debug=True)), caplog.at_level(logging.DEBUG):
             yield
 
         log_messages = [record.msg for record in caplog.get_records("call")]

tests/telemetry/test_writer.py

@@ -532,6 +532,7 @@ def test_app_started_event_configuration_override(test_agent_session, run_python
         {"name": "DD_VERSION", "origin": "default", "value": None},
         {"name": "_DD_APPSEC_DEDUPLICATION_ENABLED", "origin": "default", "value": True},
         {"name": "_DD_IAST_LAZY_TAINT", "origin": "default", "value": False},
+        {"name": "_DD_IAST_USE_ROOT_SPAN", "origin": "default", "value": False},
         {"name": "_DD_TRACE_WRITER_LOG_ERROR_PAYLOADS", "origin": "default", "value": False},
         {"name": "instrumentation_source", "origin": "code", "value": "manual"},
         {"name": "python_build_gnu_type", "origin": "unknown", "value": sysconfig.get_config_var("BUILD_GNU_TYPE")},