Fix flaky tests (#3013)

DataDog · Dec 24, 2024 · 40d7f8a · 40d7f8a
1 parent dc9911b
commit 40d7f8a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/tests/ext/telemetry/integration_filesystem_01.phpt b/tests/ext/telemetry/integration_filesystem_01.phpt
@@ -12,17 +12,18 @@ DD_TRACE_GENERATE_ROOT_SPAN=0
 _DD_LOAD_TEST_INTEGRATIONS=1
 DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
 --INI--
-datadog.trace.agent_url="file://{PWD}/integration-telemetry.out"
+datadog.trace.agent_url="file://{PWD}/integration-telemetry-01.out"
 --FILE--
 <?php
 namespace
 {
+    $file = ini_get('datadog.trace.agent_url');
     dd_trace_internal_fn("finalize_telemetry");
 
     for ($i = 0; $i < 100; ++$i) {
         usleep(100000);
-        if (file_exists(__DIR__ . '/integration-telemetry.out')) {
-            foreach (file(__DIR__ . '/integration-telemetry.out') as $l) {
+        if (file_exists($file )) {
+            foreach (file($file) as $l) {
                 if ($l) {
                     $json = json_decode($l, true);
                     $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
@@ -74,4 +75,4 @@ array(1) {
 --CLEAN--
 <?php
 
-@unlink(__DIR__ . '/integration-telemetry.out');
+@unlink(ini_get('datadog.trace.agent_url'));
diff --git a/tests/ext/telemetry/integration_filesystem_02.phpt b/tests/ext/telemetry/integration_filesystem_02.phpt
@@ -13,17 +13,18 @@ _DD_LOAD_TEST_INTEGRATIONS=1
 DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
 DD_APPSEC_RASP_ENABLED=1
 --INI--
-datadog.trace.agent_url="file://{PWD}/integration-telemetry.out"
+datadog.trace.agent_url="file://{PWD}/integration-telemetry-02.out"
 --FILE--
 <?php
 namespace
 {
+    $file = ini_get('datadog.trace.agent_url');
     dd_trace_internal_fn("finalize_telemetry");
 
     for ($i = 0; $i < 100; ++$i) {
         usleep(100000);
-        if (file_exists(__DIR__ . '/integration-telemetry.out')) {
-            foreach (file(__DIR__ . '/integration-telemetry.out') as $l) {
+        if (file_exists($file )) {
+            foreach (file($file) as $l) {
                 if ($l) {
                     $json = json_decode($l, true);
                     $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
@@ -62,4 +63,4 @@ array(1) {
 --CLEAN--
 <?php
 
-@unlink(__DIR__ . '/integration-telemetry.out');
+@unlink(ini_get('datadog.trace.agent_url'));
diff --git a/tests/ext/telemetry/integration_filesystem_03.phpt b/tests/ext/telemetry/integration_filesystem_03.phpt
@@ -13,20 +13,21 @@ _DD_LOAD_TEST_INTEGRATIONS=1
 DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
 DD_APPSEC_RASP_ENABLED=1
 --INI--
-datadog.trace.agent_url="file://{PWD}/integration-telemetry.out"
+datadog.trace.agent_url="file://{PWD}/integration-telemetry-03.out"
 --FILE--
 <?php
 namespace
 {
     //Here we use one wrapped function
     file_put_contents('/tmp/dummy', 'foo');
 
+    $file = ini_get('datadog.trace.agent_url');
     dd_trace_internal_fn("finalize_telemetry");
 
     for ($i = 0; $i < 100; ++$i) {
         usleep(100000);
-        if (file_exists(__DIR__ . '/integration-telemetry.out')) {
-            foreach (file(__DIR__ . '/integration-telemetry.out') as $l) {
+        if (file_exists($file )) {
+            foreach (file($file) as $l) {
                 if ($l) {
                     $json = json_decode($l, true);
                     $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
@@ -78,4 +79,4 @@ array(1) {
 --CLEAN--
 <?php
 
-@unlink(__DIR__ . '/integration-telemetry.out');
+@unlink(ini_get('datadog.trace.agent_url'));
diff --git a/tests/ext/telemetry/integration_filesystem_04.phpt b/tests/ext/telemetry/integration_filesystem_04.phpt
@@ -14,20 +14,18 @@ DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
 DD_APPSEC_RASP_ENABLED=1
 DD_TRACE_FILESYSTEM_ENABLED=0
 --INI--
-datadog.trace.agent_url="file://{PWD}/integration-telemetry.out"
+datadog.trace.agent_url="file://{PWD}/integration-telemetry-04.out"
 --FILE--
 <?php
 namespace
 {
-    //Here we use one wrapped function
-    file_put_contents('/tmp/dummy', 'foo');
-
+    $file = ini_get('datadog.trace.agent_url');
     dd_trace_internal_fn("finalize_telemetry");
 
     for ($i = 0; $i < 100; ++$i) {
         usleep(100000);
-        if (file_exists(__DIR__ . '/integration-telemetry.out')) {
-            foreach (file(__DIR__ . '/integration-telemetry.out') as $l) {
+        if (file_exists($file )) {
+            foreach (file($file) as $l) {
                 if ($l) {
                     $json = json_decode($l, true);
                     $batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
@@ -79,4 +77,4 @@ array(1) {
 --CLEAN--
 <?php
 
-@unlink(__DIR__ . '/integration-telemetry.out');
+@unlink(ini_get('datadog.trace.agent_url'));