fix tests

Author: dubloom

ext/process_tags.c

@@ -209,7 +209,7 @@ zend_string *ddtrace_process_tags_get_serialized(void) {
 }
 
 const ddog_Vec_Tag *ddtrace_process_tags_get_vec(void) {
-    if (ddtrace_process_tags_enabled()) {
+    if (ddtrace_process_tags_enabled() && process_tags.vec.ptr) {
         return &process_tags.vec;
     }
 

tests/ext/crashtracker_segfault.phpt

@@ -51,7 +51,7 @@ $rr->waitForRequest(function ($request) {
             if (!isset($payload["message"]["metadata"])) {
                 break;
             }
-            if (($payload["message"]["kind"] ?? "") == "Crash ping") {
+            if (($payload["is_crash"] ?? false) !== true) {
                 continue;
             }
 

tests/ext/includes/request_replayer.inc

@@ -72,6 +72,26 @@ class RequestReplayer
         } while (true);
     }
 
+    public function waitForRcRequest($matcher)
+    {
+        $i = 0;
+        do {
+            if ($i++ == $this->maxIteration) {
+                throw new Exception("wait for replay timeout");
+            }
+            usleep($this->flushInterval);
+
+            $requests = $this->replayAllRcRequests();
+            if (is_array($requests)) {
+                foreach ($requests as $request) {
+                    if ($matcher($request)) {
+                        return $request;
+                    }
+                }
+            }
+        } while (true);
+    }
+
     public function waitForDataAndReplay($ignoreTelemetry = true)
     {
         $i = 0;
@@ -104,6 +124,15 @@ class RequestReplayer
         ])), true);
     }
 
+    public function replayAllRcRequests()
+    {
+        return json_decode(file_get_contents($this->endpoint . '/replay-rc-requests', false, stream_context_create([
+            "http" => [
+                "header" => "X-Datadog-Test-Session-Token: " . ini_get("datadog.trace.agent_test_session_token"),
+            ],
+        ])), true);
+    }
+
     public function clearDumpedData()
     {
         file_get_contents($this->endpoint . '/clear-dumped-data', false, stream_context_create([

tests/ext/live-debugger/debugger_span_decoration_probe.phpt

@@ -98,7 +98,7 @@ array(2) {
   ["_dd.di.ret.probe_id"]=>
   string(1) "3"
 }
-string(%d) "/debugger/v1/input?ddtags=debugger_version:1.%s,env:none,version:,runtime_id:%s-%s-%s-%s-%s,host_name:%s"
+string(%d) "/debugger/v1/diagnostics?ddtags=debugger_version:1.%s,env:none,version:,runtime_id:%s-%s-%s-%s-%s,host_name:%s"
 array(1) {
   [0]=>
   array(6) {

tests/ext/remote_config/process_tags.phpt

@@ -27,8 +27,14 @@ $path = put_dynamic_config_file([
 ]);
 
 try {
-    $request = $rr->waitForRequest(function($req) {
-        return strpos($req["uri"], '/v0.7/config') !== false;
+    $request = $rr->waitForRcRequest(function($req) {
+        if (strpos($req["uri"], '/v0.7/config') === false) {
+            return false;
+        }
+
+        $body = json_decode($req["body"], true);
+        return isset($body["client"]["client_tracer"]["process_tags"])
+            && !empty($body["client"]["client_tracer"]["process_tags"]);
     });
     $body = json_decode($request["body"], true);
 } catch (Exception $e) {