Skip to content

[BUG] Fix a data race on the curl operation's last result code #4618

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

Open
thc1006 wants to merge 5 commits into
base: main
Choose a base branch
from
+7 −4
Open

[BUG] Fix a data race on the curl operation's last result code #4618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db18c4a
[BUG] Fix a data race on the curl operation's last result code
thc1006 Sep 21, 2026
dff7164
Merge branch 'main' into bugfix/curl-last-result-race-4614
thc1006 Sep 22, 2026
5798bce
[CHORE] Name the writer in the comment at both wait sites
thc1006 Sep 23, 2026
a7e2a06
Merge branch 'main' into bugfix/curl-last-result-race-4614
marcalff Sep 24, 2026
8f17275
Merge remote-tracking branch 'origin/main' into m18
thc1006 Sep 24, 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ Increment the:
request body on a 32-bit build
[#4630](https://github.com/open-telemetry/opentelemetry-cpp/pull/4630)

* [BUG] Fix a data race on the curl operation's last result code
[#4618](https://github.com/open-telemetry/opentelemetry-cpp/pull/4618)

## [1.29.0] 2026-09-13

* [RELEASE] Bump main branch to 1.29.0-dev (#4259)
Expand Down
8 changes: 4 additions & 4 deletions ext/src/http/client/curl/http_operation_curl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,8 @@ HttpOperation::~HttpOperation()
{
if (HttpOperationAccessor::GetThreadId(*async_data_) != std::this_thread::get_id())
{
async_data_->result_future.wait();
last_curl_result_ = async_data_->result_future.get();
// PerformCurlMessage() stores this, then calls the Cleanup() that sets the promise.
static_cast<void>(async_data_->result_future.get());
}
}
break;
Expand All @@ -533,8 +533,8 @@ void HttpOperation::Finish()
// We should not wait in callback from Cleanup()
if (HttpOperationAccessor::GetThreadId(*async_data_) != std::this_thread::get_id())
{
async_data_->result_future.wait();
last_curl_result_ = async_data_->result_future.get();
// PerformCurlMessage() stores this, then calls the Cleanup() that sets the promise.
static_cast<void>(async_data_->result_future.get());
}
}
}
Expand Down
Loading