Fixes #2175

open-telemetry · Jun 5, 2023 · 74305b8 · 74305b8
1 parent 834c0c4
commit 74305b8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h b/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h
@@ -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

diff --git a/ext/src/http/client/curl/http_operation_curl.cc b/ext/src/http/client/curl/http_operation_curl.cc
@@ -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)
@@ -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;