Skip to content

Commit 003b6bd

Browse files
committed
test(CI): use previous request-replayer version
Signed-off-by: Alexandre Rulleau <[email protected]>
1 parent 16f3683 commit 003b6bd

2 files changed

Lines changed: 22 additions & 27 deletions

File tree

.gitlab/generate-common.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ function dockerhub_login() {
104104
SNAPSHOT_REGEX_PLACEHOLDERS: 'path:/\S+/dd-trace-php(?=/),httpbin:(?<=//)httpbin-integration:8080'
105105

106106
request-replayer:
107-
name: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-request-replayer-2.0
107+
name: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-request-replayer-2.0@sha256:4f26c11d568d2401bdd35d592aeff003b89b289e525166ee5ad376066877e4ad
108108
alias: request-replayer
109109
command: ["php", "-S", "<?= $service_bind_address ?>:80", "index.php"]
110110
variables:

tests/ext/crashtracker_segfault_disabled.phpt

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -30,38 +30,33 @@ $args = getenv('TEST_PHP_ARGS')." ".getenv("TEST_PHP_EXTRA_ARGS");
3030
$cmd = $php." ".$args." -r 'posix_kill(posix_getpid(), 11);'";
3131
system($cmd);
3232

33-
try {
34-
$rr->waitForRequest(function ($request) {
35-
if ($request["uri"] != "/telemetry/proxy/api/v2/apmtelemetry") {
36-
return false;
37-
}
38-
$body = json_decode($request["body"], true);
39-
$batch = $body["request_type"] == "message-batch" ? $body["payload"] : [$body];
33+
$rr->waitForRequest(function ($request) {
34+
if ($request["uri"] != "/telemetry/proxy/api/v2/apmtelemetry") {
35+
return false;
36+
}
37+
$body = json_decode($request["body"], true);
38+
$batch = $body["request_type"] == "message-batch" ? $body["payload"] : [$body];
4039

41-
foreach ($batch as $json) {
42-
if ($json["request_type"] != "logs" || !isset($json["payload"]["logs"])) {
43-
continue;
44-
}
40+
foreach ($batch as $json) {
41+
if ($json["request_type"] != "logs" || !isset($json["payload"]["logs"])) {
42+
continue;
43+
}
4544

46-
foreach ($json["payload"]["logs"] as $payload) {
47-
if (!($payload["is_crash"] ?? false)) {
48-
continue; // Not an actual crash report (crash pings have is_crash: false)
49-
}
50-
$output = json_encode($payload, JSON_PRETTY_PRINT);
45+
foreach ($json["payload"]["logs"] as $payload) {
46+
$payload["message"] = json_decode($payload["message"], true);
47+
$output = json_encode($payload, JSON_PRETTY_PRINT);
5148

52-
echo $output;
49+
echo $output;
5350

54-
return true;
55-
}
51+
return true;
5652
}
53+
}
5754

58-
return false;
59-
});
60-
echo "unexpected: crash report received when crashtracking is disabled\n";
61-
} catch (Exception $e) {
62-
echo $e->getMessage() . "\n";
63-
}
55+
return false;
56+
});
6457

6558
?>
6659
--EXPECTF--
67-
%Await for replay timeout
60+
%A
61+
Fatal error: Uncaught Exception: wait for replay timeout in %s
62+
%A

0 commit comments

Comments
 (0)