Replace DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED with DD_APM_TRACING…

…_ENABLED
DataDog · Feb 11, 2025 · 479b78f · 479b78f
1 parent c199419
commit 479b78f
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 27 deletions.
diff --git a/appsec/src/extension/configuration.h b/appsec/src/extension/configuration.h
@@ -69,7 +69,7 @@ extern bool runtime_config_first_init;
     CONFIG(STRING, DD_APPSEC_HTTP_BLOCKED_TEMPLATE_HTML, "")                                                                          \
     CONFIG(STRING, DD_APPSEC_HTTP_BLOCKED_TEMPLATE_JSON, "")                                                                          \
     CONFIG(DOUBLE, DD_API_SECURITY_REQUEST_SAMPLE_RATE, "0.1", .ini_change = zai_config_system_ini_change)                            \
-    CONFIG(BOOL, DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED, "false")                                                                  \
+    CONFIG(BOOL, DD_APM_TRACING_ENABLED, "true")                                                                                      \
     CONFIG(BOOL, DD_API_SECURITY_ENABLED, "true", .ini_change = zai_config_system_ini_change)
 // clang-format on
 

diff --git a/appsec/src/extension/tags.c b/appsec/src/extension/tags.c
@@ -406,9 +406,9 @@ void dd_tags_add_tags(
     if (_force_keep) {
         dd_trace_set_priority_sampling_on_span_zobj(span,
             PRIORITY_SAMPLING_USER_KEEP,
-            get_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED()
-                ? DD_MECHANISM_ASM
-                : DD_MECHANISM_MANUAL);
+            get_DD_APM_TRACING_ENABLED()
+                ? DD_MECHANISM_MANUAL
+                : DD_MECHANISM_ASM);
         mlog(dd_log_debug, "Updated sampling priority to user_keep");
     }
 

diff --git a/ext/asm_event.c b/ext/asm_event.c
@@ -26,7 +26,7 @@ DDTRACE_PUBLIC void ddtrace_emit_asm_event() {
     ZVAL_STR(&_1_zval, _1_zstr);
     ddtrace_add_propagated_tag(_dd_tag_p_appsec_zstr, &_1_zval);
 
-    if (get_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED()) {
+    if (!get_DD_APM_TRACING_ENABLED()) {
         ddtrace_set_priority_sampling_on_root(PRIORITY_SAMPLING_USER_KEEP, DD_MECHANISM_ASM);
     }
 }

diff --git a/ext/auto_flush.c b/ext/auto_flush.c
@@ -60,7 +60,7 @@ ZEND_RESULT_CODE ddtrace_flush_tracer(bool force_on_startup, bool collect_cycles
         return SUCCESS;
     }
 
-    if (get_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED()) {
+    if (!get_global_DD_APM_TRACING_ENABLED()) {
         if (!DDTRACE_G(asm_event_emitted) && !trace_contains_appsec_event(&trace) && !ddtrace_standalone_limiter_allow()) {
             zval *root_span = zend_hash_index_find(Z_ARR(trace), 0);
             if (!root_span || Z_TYPE_P(root_span) != IS_ARRAY) {
@@ -111,7 +111,7 @@ ZEND_RESULT_CODE ddtrace_flush_tracer(bool force_on_startup, bool collect_cycles
                                 .tracer_version = DDOG_CHARSLICE_C_BARE(PHP_DDTRACE_VERSION),
                                 .lang_version = dd_zend_string_to_CharSlice(ddtrace_php_version),
                                 .client_computed_top_level = false,
-                                .client_computed_stats = get_global_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED(),
+                                .client_computed_stats = !get_global_DD_APM_TRACING_ENABLED(),
                         };
                         size_t size_hint = written;
                         zend_long n_requests = get_global_DD_TRACE_AGENT_FLUSH_AFTER_N_REQUESTS();

diff --git a/ext/coms.c b/ext/coms.c
@@ -695,7 +695,7 @@ static struct curl_slist *dd_agent_headers_alloc(void) {
     dd_append_header(&list, "Datadog-Meta-Lang-Interpreter", sapi_module.name);
     dd_append_header(&list, "Datadog-Meta-Lang-Version", ZSTR_VAL(ddtrace_php_version));
     dd_append_header(&list, "Datadog-Meta-Tracer-Version", PHP_DDTRACE_VERSION);
-    if (get_global_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED()) {
+    if (!get_global_DD_APM_TRACING_ENABLED()) {
         dd_append_header(&list, "Datadog-Client-Computed-Stats", "true");
     }
 

diff --git a/ext/configuration.h b/ext/configuration.h
@@ -236,7 +236,7 @@ enum ddtrace_sampling_rules_format {
     CONFIG(BOOL, DD_REMOTE_CONFIG_ENABLED, "true", .ini_change = zai_config_system_ini_change)          \
     CONFIG(BOOL, DD_DYNAMIC_INSTRUMENTATION_ENABLED, "false", .ini_change = zai_config_system_ini_change)      \
     CONFIG(SET, DD_DYNAMIC_INSTRUMENTATION_REDACTED_IDENTIFIERS, "", .ini_change = zai_config_system_ini_change) \
-    CONFIG(BOOL, DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED, "false")                                           \
+    CONFIG(BOOL, DD_APM_TRACING_ENABLED, "true")                                                               \
     CONFIG(SET, DD_DYNAMIC_INSTRUMENTATION_REDACTED_TYPES, "", .ini_change = zai_config_system_ini_change)     \
     DD_INTEGRATIONS
 

diff --git a/ext/handlers_http.h b/ext/handlers_http.h
@@ -136,11 +136,11 @@ static inline void ddtrace_inject_distributed_headers_config(zend_array *array,
     bool send_b3single = zend_hash_str_exists(inject, ZEND_STRL("b3 single header"));
 
     zend_long sampling_priority = ddtrace_fetch_priority_sampling_from_root();
-    if (get_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED() && DDTRACE_G(asm_event_emitted) == true) {
+    if (!get_DD_APM_TRACING_ENABLED() && DDTRACE_G(asm_event_emitted) == true) {
         sampling_priority = PRIORITY_SAMPLING_USER_KEEP;
     }
 
-    if (get_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED() && DDTRACE_G(asm_event_emitted) == false &&
+    if (!get_DD_APM_TRACING_ENABLED() && DDTRACE_G(asm_event_emitted) == false &&
         ddtrace_propagated_tags_get_tag(DD_TAG_P_APPSEC) == NULL) {
         return;
     }

diff --git a/ext/limiter/limiter.c b/ext/limiter/limiter.c
@@ -61,9 +61,6 @@ bool ddtrace_limiter_active() {
 }
 
 bool ddtrace_limiter_allow() {
-    if (get_global_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED()) {
-        return true;
-    }
     ZEND_ASSERT(dd_limiter);
 
     uint64_t timeval = zend_hrtime();

diff --git a/ext/priority_sampling/priority_sampling.c b/ext/priority_sampling/priority_sampling.c
@@ -124,7 +124,7 @@ static ddtrace_rule_result dd_match_rules(ddtrace_span_data *span, bool eval_roo
     }
 
     zval *rule;
-    if (!get_global_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED()) {  // APPSEC_STANDALONE enabled, override sampling rules to be empty
+    if (get_global_DD_APM_TRACING_ENABLED()) {
         ZEND_HASH_FOREACH_VAL(get_DD_TRACE_SAMPLING_RULES(), rule) {
             if (++index >= skip_at) {
                 break;
@@ -288,7 +288,7 @@ static void dd_decide_on_sampling(ddtrace_root_span_data *span) {
     bool limited = false;
     if (result.mechanism != DD_MECHANISM_MANUAL && ddtrace_limiter_active() && sampling) {
         if (span->trace_is_limited == DD_TRACE_LIMIT_UNCHECKED) {
-            span->trace_is_limited = ddtrace_limiter_allow() ? DD_TRACE_UNLIMITED : DD_TRACE_LIMITED;
+            span->trace_is_limited = !get_global_DD_APM_TRACING_ENABLED() || ddtrace_limiter_allow() ? DD_TRACE_UNLIMITED : DD_TRACE_LIMITED;
         }
         limited = span->trace_is_limited == DD_TRACE_LIMITED;
     }

diff --git a/ext/serializer.c b/ext/serializer.c
@@ -1700,7 +1700,7 @@ void ddtrace_serialize_span_to_array(ddtrace_span_data *span, zval *array) {
     }
 
     zval *asm_event = NULL;
-    if (get_global_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED()) {
+    if (!get_global_DD_APM_TRACING_ENABLED()) {
         asm_event = zend_hash_str_find(meta, ZEND_STRL(DD_TAG_P_APPSEC));
     }
     bool is_standalone_appsec_span = asm_event ? Z_TYPE_P(asm_event) == IS_STRING && strncmp(Z_STRVAL_P(asm_event), "1", sizeof("1") - 1) == 0 : 0;
@@ -1720,12 +1720,12 @@ void ddtrace_serialize_span_to_array(ddtrace_span_data *span, zval *array) {
     if (is_root_span) {
         if (Z_TYPE_P(&span->root->property_sampling_priority) != IS_UNDEF) {
             long sampling_priority = zval_get_long(&span->root->property_sampling_priority);
-            if (get_global_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED() && !is_standalone_appsec_span) {
+            if (!get_global_DD_APM_TRACING_ENABLED() && !is_standalone_appsec_span) {
                 sampling_priority = MIN(PRIORITY_SAMPLING_AUTO_KEEP, sampling_priority);
             }
             add_assoc_double(&metrics_zv, "_sampling_priority_v1", sampling_priority);
         }
-        if(get_global_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED()) {
+        if(!get_global_DD_APM_TRACING_ENABLED()) {
             add_assoc_long(&metrics_zv, "_dd.apm.enabled", 0);
         }
     }

diff --git a/tests/ext/background-sender/agent_sampling-standalone-asm_01.phpt b/tests/ext/background-sender/agent_sampling-standalone-asm_01.phpt
@@ -10,7 +10,7 @@ DD_TRACE_AGENT_FLUSH_INTERVAL=333
 DD_TRACE_GENERATE_ROOT_SPAN=0
 DD_INSTRUMENTATION_TELEMETRY_ENABLED=0
 DD_TRACE_SIDECAR_TRACE_SENDER=0
-DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED=1
+DD_APM_TRACING_ENABLED=0
 --INI--
 datadog.trace.agent_test_session_token=background-sender/agent_samplingc
 --FILE--

diff --git a/tests/ext/background-sender/agent_sampling-standalone-asm_02.phpt b/tests/ext/background-sender/agent_sampling-standalone-asm_02.phpt
@@ -10,7 +10,7 @@ DD_TRACE_AGENT_FLUSH_INTERVAL=333
 DD_TRACE_GENERATE_ROOT_SPAN=0
 DD_INSTRUMENTATION_TELEMETRY_ENABLED=0
 DD_TRACE_SIDECAR_TRACE_SENDER=0
-DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED=1
+DD_APM_TRACING_ENABLED=0
 --INI--
 datadog.trace.agent_test_session_token=background-sender/agent_samplingb
 --FILE--

diff --git a/tests/ext/background-sender/agent_sampling-standalone-asm_03.phpt b/tests/ext/background-sender/agent_sampling-standalone-asm_03.phpt
@@ -10,7 +10,7 @@ DD_TRACE_AGENT_FLUSH_INTERVAL=333
 DD_TRACE_GENERATE_ROOT_SPAN=0
 DD_INSTRUMENTATION_TELEMETRY_ENABLED=0
 DD_TRACE_SIDECAR_TRACE_SENDER=0
-DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED=1
+DD_APM_TRACING_ENABLED=0
 HTTP_X_DATADOG_TRACE_ID=42
 HTTP_X_DATADOG_PARENT_ID=10
 HTTP_X_DATADOG_ORIGIN=datadog

diff --git a/tests/ext/distributed_tracing/distributed_trace_asm_standalone_01.phpt b/tests/ext/distributed_tracing/distributed_trace_asm_standalone_01.phpt
@@ -8,7 +8,7 @@ HTTP_X_DATADOG_ORIGIN=datadog
 HTTP_X_DATADOG_SAMPLING_PRIORITY=3
 HTTP_X_DATADOG_TAGS=_dd.p.custom_tag=inherited,_dd.p.dropped,_dd.p.other_tag=also,_dd.p.drop
 DD_TRACE_GENERATE_ROOT_SPAN=0
-DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED=1
+DD_APM_TRACING_ENABLED=0
 --FILE--
 <?php
 

diff --git a/tests/ext/distributed_tracing/distributed_trace_asm_standalone_02.phpt b/tests/ext/distributed_tracing/distributed_trace_asm_standalone_02.phpt
@@ -8,7 +8,7 @@ HTTP_X_DATADOG_ORIGIN=datadog
 HTTP_X_DATADOG_SAMPLING_PRIORITY=3
 HTTP_X_DATADOG_TAGS=_dd.p.appsec=1
 DD_TRACE_GENERATE_ROOT_SPAN=0
-DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED=1
+DD_APM_TRACING_ENABLED=0
 --FILE--
 <?php
 

diff --git a/tests/ext/integrations/curl/distributed_tracing_curl_propagate_asm_event.phpt b/tests/ext/integrations/curl/distributed_tracing_curl_propagate_asm_event.phpt
@@ -6,7 +6,7 @@ Distributed tracing header tags propagate asm events with curl_exec()
 --ENV--
 DD_TRACE_TRACED_INTERNAL_FUNCTIONS=curl_exec
 HTTP_X_DATADOG_TRACE_ID=42
-DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED=1
+DD_APM_TRACING_ENABLED=0
 --FILE--
 <?php
 

diff --git a/tests/ext/limiter/003-limiter-with-asm-standalone.phpt b/tests/ext/limiter/003-limiter-with-asm-standalone.phpt
@@ -7,7 +7,7 @@ DD_TRACE_AUTO_FLUSH_ENABLED=0
 DD_TRACE_GENERATE_ROOT_SPAN=0
 DD_TRACE_RATE_LIMIT=10
 DD_TRACE_SAMPLE_RATE=1
-DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED=1
+DD_APM_TRACING_ENABLED=0
 --FILE--
 <?php
 $spans = [];

diff --git a/tests/ext/priority_sampling/asm-standalone.phpt b/tests/ext/priority_sampling/asm-standalone.phpt
@@ -3,7 +3,7 @@ priority_sampling is ignored when asm standalone is enabled
 --ENV--
 DD_TRACE_SAMPLING_RULES=[{"sample_rate": 0.3}]
 DD_TRACE_GENERATE_ROOT_SPAN=1
-DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED=1
+DD_APM_TRACING_ENABLED=0
 --FILE--
 <?php
 $root = \DDTrace\root_span();