Merge branch 'main' into async-store

open-telemetry · Mar 11, 2022 · a45f968 · a45f968
2 parents 26803b0 + 4a7200b
commit a45f968
Showing 1 changed file with 1 addition 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
@@ -186,7 +186,7 @@ class HttpOperation
 
     // Perform initial connect, handling the timeout if needed
     curl_easy_setopt(curl_, CURLOPT_CONNECT_ONLY, 1L);
-    curl_easy_setopt(curl_, CURLOPT_TIMEOUT, http_conn_timeout_.count() / 1000);
+    curl_easy_setopt(curl_, CURLOPT_TIMEOUT_MS, http_conn_timeout_.count());
     DispatchEvent(opentelemetry::ext::http::client::SessionState::Connecting);
     res_ = curl_easy_perform(curl_);
     if (CURLE_OK != res_)