Skip to content

[EXPORTER] Fixed HTTP CURL for 32bits platforms #2178

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
marcalff merged 1 commit into from
Jun 6, 2023
Merged

[EXPORTER] Fixed HTTP CURL for 32bits platforms #2178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@ class HttpOperation

CURLcode SetCurlLongOption(CURLoption option, long value);

CURLcode SetCurlOffOption(CURLoption option, curl_off_t value);

const char *GetCurlErrorMessage(CURLcode code);

std::atomic<bool> is_aborted_; // Set to 'true' when async callback is aborted
Expand Down
22 changes: 21 additions & 1 deletion 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 @@ -556,6 +556,26 @@ CURLcode HttpOperation::SetCurlLongOption(CURLoption option, long value)
return rc;
}

CURLcode HttpOperation::SetCurlOffOption(CURLoption option, curl_off_t value)
{
CURLcode rc;

/*
curl_easy_setopt() is a macro with variadic arguments, type unsafe.
SetCurlOffOption() ensures it is called with a curl_off_t.
*/
rc = curl_easy_setopt(curl_resource_.easy_handle, option, value);

if (rc != CURLE_OK)
{
const char *message = GetCurlErrorMessage(rc);
OTEL_INTERNAL_LOG_ERROR("CURL, set option <" << std::to_string(option) << "> failed: <"
<< message << ">");
}

return rc;
}

CURLcode HttpOperation::Setup()
{
if (!curl_resource_.easy_handle)
Expand Down Expand Up @@ -980,7 +1000,7 @@ CURLcode HttpOperation::Setup()
return rc;
}

rc = SetCurlLongOption(CURLOPT_POSTFIELDSIZE_LARGE, req_size);
rc = SetCurlOffOption(CURLOPT_POSTFIELDSIZE_LARGE, req_size);
if (rc != CURLE_OK)
{
return rc;
Expand Down