Amend dm and priority on asm events

Author: estringana

Diff for: appsec/src/extension/configuration.h

@@ -69,6 +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_API_SECURITY_ENABLED, "true", .ini_change = zai_config_system_ini_change)
 // clang-format on
 

Diff for: appsec/src/extension/ddtrace.h

@@ -20,6 +20,7 @@ enum dd_sampling_mechanism {
     DD_MECHANISM_REMOTE_RATE = 2,
     DD_MECHANISM_RULE = 3,
     DD_MECHANISM_MANUAL = 4,
+    DD_MECHANISM_ASM = 5,
 };
 
 typedef zend_object root_span_t;

Diff for: appsec/src/extension/tags.c

@@ -352,7 +352,7 @@ void dd_tags_add_tags(
 
     if (_force_keep) {
         dd_trace_set_priority_sampling_on_span_zobj(
-            span, PRIORITY_SAMPLING_USER_KEEP, DD_MECHANISM_MANUAL);
+            span, PRIORITY_SAMPLING_USER_KEEP, get_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED() ? DD_MECHANISM_ASM: DD_MECHANISM_MANUAL);
         mlog(dd_log_debug, "Updated sampling priority to user_keep");
     }
 

Diff for: appsec/tests/extension/client_init_record_span_tags.phpt

@@ -86,7 +86,7 @@ Array
 (
     [_dd.appsec.json] => {"triggers":[{"found":"attack"},{"another":"attack"},{"yet another":"attack"}]}
     [_dd.p.appsec] => 1
-    [_dd.p.dm] => -0
+    [_dd.p.dm] => -5
     [_dd.p.tid] => %s
     [_dd.runtime_family] => php
     [appsec.event] => true
@@ -107,7 +107,6 @@ Array
     [metric_1] => 2
     [metric_2] => 10
     [_dd.appsec.enabled] => 1
-    [_dd.agent_psr] => 1
     [_sampling_priority_v1] => 1
     [php.compilation.total_time_ms] => %f
     [php.memory.peak_usage_bytes] => %f

Diff for: appsec/tests/extension/rinit_record_span_tags.phpt

@@ -81,7 +81,7 @@ Array
 (
     [_dd.appsec.json] => {"triggers":[{"found":"attack"},{"another":"attack"},{"yet another":"attack"}]}
     [_dd.p.appsec] => 1
-    [_dd.p.dm] => -0
+    [_dd.p.dm] => -5
     [_dd.p.tid] => %s
     [_dd.runtime_family] => php
     [appsec.event] => true
@@ -100,7 +100,6 @@ Array
     [%s] => %d
     [rshutdown_metric] => 2.1
     [_dd.appsec.enabled] => 1
-    [_dd.agent_psr] => 1
     [_sampling_priority_v1] => 1
     [php.compilation.total_time_ms] => %f
     [php.memory.peak_usage_bytes] => %f

Diff for: config.m4

@@ -163,6 +163,7 @@ if test "$PHP_DDTRACE" != "no"; then
   DD_TRACE_PHP_SOURCES="$EXTRA_PHP_SOURCES \
     ext/ddtrace.c \
     ext/agent_info.c \
+    ext/asm_event.c \
     ext/arrays.c \
     ext/auto_flush.c \
     ext/autoload_php_files.c \
@@ -188,7 +189,6 @@ if test "$PHP_DDTRACE" != "no"; then
     ext/integrations/exec_integration.c \
     ext/integrations/integrations.c \
     ext/ip_extraction.c \
-    ext/ddappsec.c \
     ext/standalone_limiter.c \
     ext/live_debugger.c \
     ext/logging.c \

Diff for: config.w32

@@ -17,6 +17,7 @@ if (PHP_DDTRACE != 'no') {
 
 	var DDTRACE_EXT_SOURCES = "agent_info.c";
 	DDTRACE_EXT_SOURCES += " arrays.c";
+	DDTRACE_EXT_SOURCES += " asm_event.c";
 	DDTRACE_EXT_SOURCES += " auto_flush.c";
 	DDTRACE_EXT_SOURCES += " autoload_php_files.c";
 	DDTRACE_EXT_SOURCES += " collect_backtrace.c";
@@ -36,7 +37,6 @@ if (PHP_DDTRACE != 'no') {
 	DDTRACE_EXT_SOURCES += " handlers_internal.c";
 	DDTRACE_EXT_SOURCES += " handlers_pcntl.c";
 	DDTRACE_EXT_SOURCES += " ip_extraction.c";
-	DDTRACE_EXT_SOURCES += " ddappsec.c";
 	DDTRACE_EXT_SOURCES += " standalone_limiter.c";
 	DDTRACE_EXT_SOURCES += " live_debugger.c";
 	DDTRACE_EXT_SOURCES += " logging.c";

Diff for: ext/asm_event.c

@@ -1,5 +1,6 @@
 #include "asm_event.h"
 #include "ddtrace.h"
+#include "priority_sampling/priority_sampling.h"
 #include "tracer_tag_propagation/tracer_tag_propagation.h"
 
 ZEND_EXTERN_MODULE_GLOBALS(ddtrace);
@@ -22,6 +23,8 @@ DDTRACE_PUBLIC void ddtrace_emit_asm_event() {
     zval _1_zval;
     ZVAL_STR(&_1_zval, _1_zstr);
     ddtrace_add_propagated_tag(_dd_tag_p_appsec_zstr, &_1_zval);
+
+    ddtrace_set_priority_sampling_on_root(PRIORITY_SAMPLING_AUTO_KEEP, DD_MECHANISM_ASM);
 }
 
 PHP_FUNCTION(DDTrace_Testing_emit_asm_event) {

Diff for: ext/priority_sampling/priority_sampling.h

@@ -18,6 +18,7 @@ enum dd_sampling_mechanism {
     DD_MECHANISM_REMOTE_RATE = 2,
     DD_MECHANISM_RULE = 3,
     DD_MECHANISM_MANUAL = 4,
+    DD_MECHANISM_ASM = 5,
     DD_MECHANISM_REMOTE_USER_RULE = 11,
     DD_MECHANISM_REMOTE_DYNAMIC_RULE = 12,
 };

Diff for: tests/ext/background-sender/agent_sampling-standalone-asm_02.phpt

@@ -47,9 +47,9 @@ echo "This call also has the same sample rate: {$get_sampling()}\n";
 ?>
 --EXPECTF--
 [ddtrace] [info] Flushing trace of size 1 to send-queue for http://request-replayer:80
-First call it is used as heartbeat: 1
+First call it is used as heartbeat: 2
 [ddtrace] [info] Flushing trace of size 1 to send-queue for http://request-replayer:80
-This call has the same sample rate: 1
+This call has the same sample rate: 2
 [ddtrace] [info] Flushing trace of size 1 to send-queue for http://request-replayer:80
-This call also has the same sample rate: 1
+This call also has the same sample rate: 2
 [ddtrace] [info] No finished traces to be sent to the agent

Diff for: tests/ext/integrations/curl/distributed_tracing_curl_propagate_asm_event.phpt

@@ -37,4 +37,4 @@ dt_dump_headers_from_httpbin(query_headers(), ['x-datadog-tags']);
 
 ?>
 --EXPECT--
-x-datadog-tags: _dd.p.appsec=1,_dd.p.dm=-4
+x-datadog-tags: _dd.p.appsec=1,_dd.p.dm=-5