Skip to content

[SDK] Fixes duration overflow #3529

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
merged 5 commits into from
Jul 10, 2025
Merged

[SDK] Fixes duration overflow #3529

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52a7c1f
Fixes duration overflow
owent Jul 10, 2025
209760a
Fixes IWYU and asan
owent Jul 10, 2025
08b9e8b
Fixes IWYU
owent Jul 10, 2025
5e1dea3
Merge branch 'main' into fixes_overflow_of_duration
owent Jul 10, 2025
20089a4
Merge branch 'main' into fixes_overflow_of_duration
lalitb Jul 10, 2025
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
35 changes: 12 additions & 23 deletions sdk/src/logs/multi_log_record_processor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,77 +75,66 @@ void MultiLogRecordProcessor::OnEmit(std::unique_ptr<Recordable> &&record) noexc

bool MultiLogRecordProcessor::ForceFlush(std::chrono::microseconds timeout) noexcept
{
// Convert to nanos to prevent overflow
std::chrono::nanoseconds timeout_ns = std::chrono::nanoseconds::max();
if (std::chrono::duration_cast<std::chrono::microseconds>(timeout_ns) > timeout)
{
timeout_ns = std::chrono::duration_cast<std::chrono::nanoseconds>(timeout);
}
bool result = true;
auto start_time = std::chrono::system_clock::now();
auto overflow_checker = std::chrono::system_clock::time_point::max();
std::chrono::system_clock::time_point expire_time;
if (overflow_checker - start_time <= timeout_ns)
if (std::chrono::duration_cast<std::chrono::microseconds>(overflow_checker - start_time) <=
timeout)
{
expire_time = overflow_checker;
}
else
{
expire_time =
start_time + std::chrono::duration_cast<std::chrono::system_clock::duration>(timeout_ns);
start_time + std::chrono::duration_cast<std::chrono::system_clock::duration>(timeout);
}
for (auto &processor : processors_)
{
if (!processor->ForceFlush(std::chrono::duration_cast<std::chrono::microseconds>(timeout_ns)))
if (!processor->ForceFlush(timeout))
{
result = false;
}
start_time = std::chrono::system_clock::now();
if (expire_time > start_time)
{
timeout_ns = std::chrono::duration_cast<std::chrono::nanoseconds>(expire_time - start_time);
timeout = std::chrono::duration_cast<std::chrono::microseconds>(expire_time - start_time);
}
else
{
timeout_ns = std::chrono::nanoseconds::zero();
timeout = std::chrono::microseconds::zero();
}
}
return result;
}

bool MultiLogRecordProcessor::Shutdown(std::chrono::microseconds timeout) noexcept
{
// Converto nanos to prevent overflow
std::chrono::nanoseconds timeout_ns = std::chrono::nanoseconds::max();
if (std::chrono::duration_cast<std::chrono::microseconds>(timeout_ns) > timeout)
{
timeout_ns = std::chrono::duration_cast<std::chrono::nanoseconds>(timeout);
}
bool result = true;
auto start_time = std::chrono::system_clock::now();
auto overflow_checker = std::chrono::system_clock::time_point::max();
std::chrono::system_clock::time_point expire_time;
if (overflow_checker - start_time <= timeout_ns)
if (std::chrono::duration_cast<std::chrono::microseconds>(overflow_checker - start_time) <=
timeout)
{
expire_time = overflow_checker;
}
else
{
expire_time =
start_time + std::chrono::duration_cast<std::chrono::system_clock::duration>(timeout_ns);
start_time + std::chrono::duration_cast<std::chrono::system_clock::duration>(timeout);
}
for (auto &processor : processors_)
{
result |=
processor->Shutdown(std::chrono::duration_cast<std::chrono::microseconds>(timeout_ns));
result |= processor->Shutdown(timeout);
start_time = std::chrono::system_clock::now();
if (expire_time > start_time)
{
timeout_ns = std::chrono::duration_cast<std::chrono::nanoseconds>(expire_time - start_time);
timeout = std::chrono::duration_cast<std::chrono::microseconds>(expire_time - start_time);
}
else
{
timeout_ns = std::chrono::nanoseconds::zero();
timeout = std::chrono::microseconds::zero();
}
}
return result;
Expand Down
Loading