Skip to content

tests: poll for batch flush instead of fixed sleep #1527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpnurmi merged 3 commits into from
Feb 18, 2026
Merged

tests: poll for batch flush instead of fixed sleep #1527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdcb189
tests: poll for batch flush instead of fixed sleep
jpnurmi Feb 17, 2026
fce94c4
tests: fix 5s polling timeout
jpnurmi Feb 17, 2026
f7f5c4a
tests: use atomics for called_count polled across threads
jpnurmi Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions tests/unit/test_logs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "sentry_logs.h"
#include "sentry_sync.h"
#include "sentry_testsupport.h"

#include "sentry_envelope.h"
Expand All @@ -13,7 +14,7 @@
#endif

typedef struct {
uint64_t called_count;
volatile long called_count;
bool has_validation_error;
} transport_validation_data_t;

Expand All @@ -37,7 +38,7 @@ validate_logs_envelope(sentry_envelope_t *envelope, void *data)

// Only validate and count log envelopes, skip others (e.g., session)
if (strcmp(type, "log") == 0) {
validation_data->called_count += 1;
sentry__atomic_fetch_and_add(&validation_data->called_count, 1);
}

sentry_envelope_free(envelope);
Expand Down Expand Up @@ -65,8 +66,14 @@ SENTRY_TEST(basic_logging_functionality)
TEST_CHECK_INT_EQUAL(sentry_log_info("Info message"), 0);
TEST_CHECK_INT_EQUAL(sentry_log_warn("Warning message"), 0);
TEST_CHECK_INT_EQUAL(sentry_log_error("Error message"), 0);
// Sleep to allow first batch to flush (testing batch timing behavior)
sleep_ms(20);
// Sleep up to 5s to allow first batch to flush (testing batch timing
// behavior)
for (int i = 0;
i < 250 && sentry__atomic_fetch(&validation_data.called_count) < 1;
i++) {
sleep_ms(20);
}
TEST_CHECK_INT_EQUAL(validation_data.called_count, 1);
TEST_CHECK_INT_EQUAL(sentry_log_fatal("Fatal message"), 0);
sentry_close();

Expand Down
14 changes: 10 additions & 4 deletions tests/unit/test_metrics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "sentry_metrics.h"
#include "sentry_sync.h"
#include "sentry_testsupport.h"

#include "sentry_envelope.h"
Expand All @@ -13,7 +14,7 @@
#endif

typedef struct {
uint64_t called_count;
volatile long called_count;
bool has_validation_error;
} transport_validation_data_t;

Expand All @@ -36,7 +37,7 @@ validate_metrics_envelope(sentry_envelope_t *envelope, void *data)

// Only validate and count metric envelopes, skip others (e.g., session)
if (strcmp(type, "trace_metric") == 0) {
validation_data->called_count += 1;
sentry__atomic_fetch_and_add(&validation_data->called_count, 1);
}

sentry_envelope_free(envelope);
Expand Down Expand Up @@ -146,8 +147,13 @@ SENTRY_TEST(metrics_batch)
sentry_metrics_count("test.counter", 1, sentry_value_new_null()),
SENTRY_METRICS_RESULT_SUCCESS);
}
// Sleep to allow first batch to flush
sleep_ms(20);
// Sleep up to 5s to allow first batch to flush
for (int i = 0;
i < 250 && sentry__atomic_fetch(&validation_data.called_count) < 1;
i++) {
sleep_ms(20);
}
TEST_CHECK_INT_EQUAL(validation_data.called_count, 1);
TEST_CHECK_INT_EQUAL(
sentry_metrics_count("test.counter", 1, sentry_value_new_null()),
SENTRY_METRICS_RESULT_SUCCESS);
Expand Down
Loading