Fixup testsuite

bwoebi · bwoebi · commit b56254195791 · 2026-07-24T17:43:45.000+02:00
Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;
diff --git a/tests/ext/appsec/agentic_onboarding_test.inc b/tests/ext/appsec/agentic_onboarding_test.inc
@@ -19,7 +19,7 @@ for ($i = 0; $i < 300; ++$i) {
     if (file_exists(__DIR__ . '/'.$id.'-telemetry.out')) {
         $batches = [];
         foreach (file(__DIR__ . '/'.$id.'-telemetry.out') as $l) {
-            if ($l) {
+            if ($l && $l[0] == '{') {
                 $json = json_decode($l, true);
                 if ($json) {
                     if ($json["application"]["service_name"] == "background_sender-php-service" || $json["application"]["service_name"] == "datadog-ipc-helper") {
diff --git a/tests/ext/appsec/sca_test.inc b/tests/ext/appsec/sca_test.inc
@@ -19,7 +19,7 @@ for ($i = 0; $i < 300; ++$i) {
     if (file_exists(__DIR__ . '/'.$id.'-telemetry.out')) {
         $batches = [];
         foreach (file(__DIR__ . '/'.$id.'-telemetry.out') as $l) {
-            if ($l) {
+            if ($l && $l[0] == '{') {
                 $json = json_decode($l, true);
                 if ($json) {
                     if ($json["application"]["service_name"] == "background_sender-php-service" || $json["application"]["service_name"] == "datadog-ipc-helper") {
diff --git a/tests/ext/library_config/fleet_config.phpt b/tests/ext/library_config/fleet_config.phpt
@@ -42,7 +42,7 @@ for ($i = 0; $i < 100; ++$i) {
     ("us" . "leep")(100000);
     if (file_exists(__DIR__ . '/fleet-config-telemetry.out')) {
         foreach (file(__DIR__ . '/fleet-config-telemetry.out') as $l) {
-            if ($l) {
+            if ($l && $l[0] == '{') {
                 $json = json_decode($l, true);
                 $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
                 foreach ($batch as $json) {
diff --git a/tests/ext/library_config/local_config.phpt b/tests/ext/library_config/local_config.phpt
@@ -42,7 +42,7 @@ for ($i = 0; $i < 100; ++$i) {
     ("us" . "leep")(100000);
     if (file_exists(__DIR__ . '/local-config-telemetry.out')) {
         foreach (file(__DIR__ . '/local-config-telemetry.out') as $l) {
-            if ($l) {
+            if ($l && $l[0] == '{') {
                 $json = json_decode($l, true);
                 $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
                 foreach ($batch as $json) {
diff --git a/tests/ext/telemetry/broken_pipe.phpt b/tests/ext/telemetry/broken_pipe.phpt
@@ -38,7 +38,7 @@ for ($i = 0; $i < 300; ++$i) {
     if (file_exists(__DIR__ . '/broken_pipe-telemetry.out')) {
         $batches = [];
         foreach (file(__DIR__ . '/broken_pipe-telemetry.out') as $l) {
-            if ($l) {
+            if ($l && $l[0] == '{') {
                 $json = json_decode($l, true);
                 if ($json["application"]["service_name"] == "background_sender-php-service" || $json["application"]["service_name"] == "datadog-ipc-helper") {
                     continue;
diff --git a/tests/ext/telemetry/composer.phpt b/tests/ext/telemetry/composer.phpt
@@ -27,7 +27,7 @@ for ($i = 0; $i < 300; ++$i) {
     ("us" . "leep")(100000);
     if (file_exists(__DIR__ . '/composer-telemetry.out')) {
         foreach (file(__DIR__ . '/composer-telemetry.out') as $l) {
-            if ($l) {
+            if ($l && $l[0] == '{') {
                 $json = json_decode($l, true);
                 $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
                 foreach ($batch as $json) {
diff --git a/tests/ext/telemetry/config.phpt b/tests/ext/telemetry/config.phpt
@@ -42,7 +42,7 @@ for ($i = 0; $i < 300; ++$i) {
     ("us" . "leep")(100000);
     if (file_exists(__DIR__ . '/config-telemetry.out')) {
         foreach (file(__DIR__ . '/config-telemetry.out') as $l) {
-            if ($l) {
+            if ($l && $l[0] == '{') {
                 $json = json_decode($l, true);
                 $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
                 foreach ($batch as $json) {
diff --git a/tests/ext/telemetry/disabled.phpt b/tests/ext/telemetry/disabled.phpt
@@ -19,7 +19,7 @@ DDTrace\close_span();
 dd_trace_internal_fn("finalize_telemetry");
 
 usleep(100000);
-var_dump(file_exists(__DIR__ . '/disabled-telemetry.out'));
+var_dump(strpos(@file_get_contents(__DIR__ . '/disabled-telemetry.out') ?: "", "app-started"));
 
 ?>
 --EXPECT--
diff --git a/tests/ext/telemetry/integration.phpt b/tests/ext/telemetry/integration.phpt
@@ -48,7 +48,7 @@ namespace
         ("us" . "leep")(100000);
         if (file_exists(__DIR__ . '/integration-telemetry.out')) {
             foreach (file(__DIR__ . '/integration-telemetry.out') as $l) {
-                if ($l) {
+                if ($l && $l[0] == '{') {
                     $json = json_decode($l, true);
                     $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
                     foreach ($batch as $json) {
diff --git a/tests/ext/telemetry/integration_filesystem_01.phpt b/tests/ext/telemetry/integration_filesystem_01.phpt
@@ -25,7 +25,7 @@ namespace
         usleep(100000);
         if (file_exists($file )) {
             foreach (file($file) as $l) {
-                if ($l) {
+                if ($l && $l[0] == '{') {
                     $json = json_decode($l, true);
                     $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
                     foreach ($batch as $json) {
diff --git a/tests/ext/telemetry/integration_filesystem_02.phpt b/tests/ext/telemetry/integration_filesystem_02.phpt
@@ -25,7 +25,7 @@ namespace
         usleep(100000);
         if (file_exists($file )) {
             foreach (file($file) as $l) {
-                if ($l) {
+                if ($l && $l[0] == '{') {
                     $json = json_decode($l, true);
                     $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
                     foreach ($batch as $json) {
diff --git a/tests/ext/telemetry/integration_filesystem_03.phpt b/tests/ext/telemetry/integration_filesystem_03.phpt
@@ -27,7 +27,7 @@ namespace
         usleep(100000);
         if (file_exists($file )) {
             foreach (file($file) as $l) {
-                if ($l) {
+                if ($l && $l[0] == '{') {
                     $json = json_decode($l, true);
                     $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
                     foreach ($batch as $json) {
diff --git a/tests/ext/telemetry/integration_filesystem_04.phpt b/tests/ext/telemetry/integration_filesystem_04.phpt
@@ -25,7 +25,7 @@ namespace
         usleep(100000);
         if (file_exists($file )) {
             foreach (file($file) as $l) {
-                if ($l) {
+                if ($l && $l[0] == '{') {
                     $json = json_decode($l, true);
                     $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
                     foreach ($batch as $json) {
diff --git a/tests/ext/telemetry/integration_runtime_error.phpt b/tests/ext/telemetry/integration_runtime_error.phpt
@@ -39,7 +39,7 @@ for ($i = 0; $i < 300; ++$i) {
     ("us" . "leep")(100000);
     if (file_exists(__DIR__ . '/integration-runtime-error-telemetry.out')) {
         foreach (file(__DIR__ . '/integration-runtime-error-telemetry.out') as $l) {
-            if ($l) {
+            if ($l && $l[0] == '{') {
                 $json = json_decode($l, true);
                 $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
                 foreach ($batch as $json) {
diff --git a/tests/ext/telemetry/metrics_logs_created.phpt b/tests/ext/telemetry/metrics_logs_created.phpt
@@ -24,7 +24,7 @@ for ($i = 0; $i < 300; ++$i) {
     ("us" . "leep")(100000);
     if (file_exists(__DIR__ . '/metrics-logs-created-telemetry.out')) {
         foreach (file(__DIR__ . '/metrics-logs-created-telemetry.out') as $l) {
-            if ($l) {
+            if ($l && $l[0] == '{') {
                 $json = json_decode($l, true);
                 if (($json["application"]["language_version"] ?? "") == "SIDECAR") {
                     continue;
diff --git a/tests/ext/telemetry/metrics_spans_created.phpt b/tests/ext/telemetry/metrics_spans_created.phpt
@@ -84,7 +84,7 @@ namespace
         ("us" . "leep")(100000);
         if (file_exists(__DIR__ . '/metrics-spans_created-telemetry.out')) {
             foreach (file(__DIR__ . '/metrics-spans_created-telemetry.out') as $l) {
-                if ($l) {
+                if ($l && $l[0] == '{') {
                     $json = json_decode($l, true);
                     if (($json["application"]["language_version"] ?? "") == "SIDECAR") {
                         continue;
diff --git a/tests/ext/telemetry/simple.phpt b/tests/ext/telemetry/simple.phpt
@@ -33,7 +33,7 @@ for ($i = 0; $i < 300; ++$i) {
     if (file_exists(__DIR__ . '/simple-telemetry.out')) {
         $batches = [];
         foreach (file(__DIR__ . '/simple-telemetry.out') as $l) {
-            if ($l) {
+            if ($l && $l[0] == '{') {
                 $json = json_decode($l, true);
                 if ($json["application"]["service_name"] == "background_sender-php-service" || $json["application"]["service_name"] == "datadog-ipc-helper") {
                     continue;
diff --git a/tests/ext/telemetry/telemetry_process_tags.phpt b/tests/ext/telemetry/telemetry_process_tags.phpt
@@ -31,7 +31,7 @@ for ($i = 0; $i < 300; ++$i) {
     ("us" . "leep")(100000);
     if (file_exists(__DIR__ . '/process-tags-telemetry.out')) {
         foreach (file(__DIR__ . '/process-tags-telemetry.out') as $l) {
-            if ($l) {
+            if ($l && $l[0] == '{') {
                 $json = json_decode($l, true);
                 var_dump($json["application"]["process_tags"]);
                 break 2;
