Skip to content

Commit 40d7f8a

Browse files
authored
Fix flaky tests (#3013)
1 parent dc9911b commit 40d7f8a

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

tests/ext/telemetry/integration_filesystem_01.phpt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,18 @@ DD_TRACE_GENERATE_ROOT_SPAN=0
1212
_DD_LOAD_TEST_INTEGRATIONS=1
1313
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
1414
--INI--
15-
datadog.trace.agent_url="file://{PWD}/integration-telemetry.out"
15+
datadog.trace.agent_url="file://{PWD}/integration-telemetry-01.out"
1616
--FILE--
1717
<?php
1818
namespace
1919
{
20+
$file = ini_get('datadog.trace.agent_url');
2021
dd_trace_internal_fn("finalize_telemetry");
2122

2223
for ($i = 0; $i < 100; ++$i) {
2324
usleep(100000);
24-
if (file_exists(__DIR__ . '/integration-telemetry.out')) {
25-
foreach (file(__DIR__ . '/integration-telemetry.out') as $l) {
25+
if (file_exists($file )) {
26+
foreach (file($file) as $l) {
2627
if ($l) {
2728
$json = json_decode($l, true);
2829
$batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
@@ -74,4 +75,4 @@ array(1) {
7475
--CLEAN--
7576
<?php
7677

77-
@unlink(__DIR__ . '/integration-telemetry.out');
78+
@unlink(ini_get('datadog.trace.agent_url'));

tests/ext/telemetry/integration_filesystem_02.phpt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ _DD_LOAD_TEST_INTEGRATIONS=1
1313
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
1414
DD_APPSEC_RASP_ENABLED=1
1515
--INI--
16-
datadog.trace.agent_url="file://{PWD}/integration-telemetry.out"
16+
datadog.trace.agent_url="file://{PWD}/integration-telemetry-02.out"
1717
--FILE--
1818
<?php
1919
namespace
2020
{
21+
$file = ini_get('datadog.trace.agent_url');
2122
dd_trace_internal_fn("finalize_telemetry");
2223

2324
for ($i = 0; $i < 100; ++$i) {
2425
usleep(100000);
25-
if (file_exists(__DIR__ . '/integration-telemetry.out')) {
26-
foreach (file(__DIR__ . '/integration-telemetry.out') as $l) {
26+
if (file_exists($file )) {
27+
foreach (file($file) as $l) {
2728
if ($l) {
2829
$json = json_decode($l, true);
2930
$batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
@@ -62,4 +63,4 @@ array(1) {
6263
--CLEAN--
6364
<?php
6465

65-
@unlink(__DIR__ . '/integration-telemetry.out');
66+
@unlink(ini_get('datadog.trace.agent_url'));

tests/ext/telemetry/integration_filesystem_03.phpt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,21 @@ _DD_LOAD_TEST_INTEGRATIONS=1
1313
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
1414
DD_APPSEC_RASP_ENABLED=1
1515
--INI--
16-
datadog.trace.agent_url="file://{PWD}/integration-telemetry.out"
16+
datadog.trace.agent_url="file://{PWD}/integration-telemetry-03.out"
1717
--FILE--
1818
<?php
1919
namespace
2020
{
2121
//Here we use one wrapped function
2222
file_put_contents('/tmp/dummy', 'foo');
2323

24+
$file = ini_get('datadog.trace.agent_url');
2425
dd_trace_internal_fn("finalize_telemetry");
2526

2627
for ($i = 0; $i < 100; ++$i) {
2728
usleep(100000);
28-
if (file_exists(__DIR__ . '/integration-telemetry.out')) {
29-
foreach (file(__DIR__ . '/integration-telemetry.out') as $l) {
29+
if (file_exists($file )) {
30+
foreach (file($file) as $l) {
3031
if ($l) {
3132
$json = json_decode($l, true);
3233
$batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
@@ -78,4 +79,4 @@ array(1) {
7879
--CLEAN--
7980
<?php
8081

81-
@unlink(__DIR__ . '/integration-telemetry.out');
82+
@unlink(ini_get('datadog.trace.agent_url'));

tests/ext/telemetry/integration_filesystem_04.phpt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,18 @@ DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
1414
DD_APPSEC_RASP_ENABLED=1
1515
DD_TRACE_FILESYSTEM_ENABLED=0
1616
--INI--
17-
datadog.trace.agent_url="file://{PWD}/integration-telemetry.out"
17+
datadog.trace.agent_url="file://{PWD}/integration-telemetry-04.out"
1818
--FILE--
1919
<?php
2020
namespace
2121
{
22-
//Here we use one wrapped function
23-
file_put_contents('/tmp/dummy', 'foo');
24-
22+
$file = ini_get('datadog.trace.agent_url');
2523
dd_trace_internal_fn("finalize_telemetry");
2624

2725
for ($i = 0; $i < 100; ++$i) {
2826
usleep(100000);
29-
if (file_exists(__DIR__ . '/integration-telemetry.out')) {
30-
foreach (file(__DIR__ . '/integration-telemetry.out') as $l) {
27+
if (file_exists($file )) {
28+
foreach (file($file) as $l) {
3129
if ($l) {
3230
$json = json_decode($l, true);
3331
$batch = $json["request_type"] == "message-batch" ? $json["payload"] : [$json];
@@ -79,4 +77,4 @@ array(1) {
7977
--CLEAN--
8078
<?php
8179

82-
@unlink(__DIR__ . '/integration-telemetry.out');
80+
@unlink(ini_get('datadog.trace.agent_url'));

0 commit comments

Comments
 (0)