diff --git a/ci/do_ci.ps1 b/ci/do_ci.ps1 index a04ec938f5..72d80402b2 100644 --- a/ci/do_ci.ps1 +++ b/ci/do_ci.ps1 @@ -25,7 +25,7 @@ if (!(test-path plugin)) { } $PLUGIN_DIR = Join-Path "$SRC_DIR" "plugin" -$VCPKG_DIR = Join-Path "$SRC_DIR" "tools" "vcpkg" +$VCPKG_DIR = Join-Path "$SRC_DIR" "tools/vcpkg" $Env:CTEST_OUTPUT_ON_FAILURE = "1" @@ -135,6 +135,9 @@ switch ($action) { "cmake.maintainer.test" { cd "$BUILD_DIR" cmake $SRC_DIR ` + -DWITH_OTLP_GRPC=ON ` + -DWITH_OTLP_HTTP=ON ` + -DWITH_OTLP_RETRY_PREVIEW=ON ` -DOTELCPP_MAINTAINER_MODE=ON ` -DWITH_NO_DEPRECATED_CODE=ON ` -DVCPKG_TARGET_TRIPLET=x64-windows ` @@ -159,6 +162,9 @@ switch ($action) { cmake $SRC_DIR ` -DWITH_STL=CXX20 ` -DCMAKE_CXX_STANDARD=20 ` + -DWITH_OTLP_GRPC=ON ` + -DWITH_OTLP_HTTP=ON ` + -DWITH_OTLP_RETRY_PREVIEW=ON ` -DOTELCPP_MAINTAINER_MODE=ON ` -DWITH_NO_DEPRECATED_CODE=ON ` -DVCPKG_TARGET_TRIPLET=x64-windows ` @@ -203,6 +209,9 @@ switch ($action) { cd "$BUILD_DIR" cmake $SRC_DIR ` -DVCPKG_TARGET_TRIPLET=x64-windows ` + -DWITH_OTLP_GRPC=ON ` + -DWITH_OTLP_HTTP=ON ` + -DWITH_OTLP_RETRY_PREVIEW=ON ` -DWITH_OTPROTCOL=ON ` "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake" $exit = $LASTEXITCODE diff --git a/ci/setup_windows_ci_environment.ps1 b/ci/setup_windows_ci_environment.ps1 index 7ad57c3464..ff2c2f9f60 100755 --- a/ci/setup_windows_ci_environment.ps1 +++ b/ci/setup_windows_ci_environment.ps1 @@ -19,4 +19,10 @@ $VCPKG_DIR = (Get-Item -Path ".\").FullName # nlohmann-json ./vcpkg "--vcpkg-root=$VCPKG_DIR" install nlohmann-json:x64-windows +# grpc +./vcpkg "--vcpkg-root=$VCPKG_DIR" install grpc:x64-windows + +# curl +./vcpkg "--vcpkg-root=$VCPKG_DIR" install curl:x64-windows + Pop-Location diff --git a/exporters/otlp/test/otlp_grpc_exporter_test.cc b/exporters/otlp/test/otlp_grpc_exporter_test.cc index c3ba455c09..b57dc6604f 100644 --- a/exporters/otlp/test/otlp_grpc_exporter_test.cc +++ b/exporters/otlp/test/otlp_grpc_exporter_test.cc @@ -359,9 +359,9 @@ TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryDefaultValues) std::unique_ptr exporter(new OtlpGrpcExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 5); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f); } TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryValuesFromEnv) @@ -374,9 +374,9 @@ TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryValuesFromEnv) std::unique_ptr exporter(new OtlpGrpcExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 123); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f); unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_ATTEMPTS"); unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_INITIAL_BACKOFF"); @@ -394,9 +394,9 @@ TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryGenericValuesFromEnv) std::unique_ptr exporter(new OtlpGrpcExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 321); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f); unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS"); unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF"); diff --git a/exporters/otlp/test/otlp_grpc_log_record_exporter_test.cc b/exporters/otlp/test/otlp_grpc_log_record_exporter_test.cc index 4521dfeeaa..0e1aa8e3e3 100644 --- a/exporters/otlp/test/otlp_grpc_log_record_exporter_test.cc +++ b/exporters/otlp/test/otlp_grpc_log_record_exporter_test.cc @@ -473,9 +473,9 @@ TEST_F(OtlpGrpcLogRecordExporterTestPeer, ConfigRetryDefaultValues) std::unique_ptr exporter(new OtlpGrpcLogRecordExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 5); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f); } TEST_F(OtlpGrpcLogRecordExporterTestPeer, ConfigRetryValuesFromEnv) @@ -488,9 +488,9 @@ TEST_F(OtlpGrpcLogRecordExporterTestPeer, ConfigRetryValuesFromEnv) std::unique_ptr exporter(new OtlpGrpcLogRecordExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 123); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f); unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_ATTEMPTS"); unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_INITIAL_BACKOFF"); @@ -508,9 +508,9 @@ TEST_F(OtlpGrpcLogRecordExporterTestPeer, ConfigRetryGenericValuesFromEnv) std::unique_ptr exporter(new OtlpGrpcLogRecordExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 321); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f); unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS"); unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF"); diff --git a/exporters/otlp/test/otlp_grpc_metric_exporter_test.cc b/exporters/otlp/test/otlp_grpc_metric_exporter_test.cc index cf32b1387a..429dd01b5c 100644 --- a/exporters/otlp/test/otlp_grpc_metric_exporter_test.cc +++ b/exporters/otlp/test/otlp_grpc_metric_exporter_test.cc @@ -225,9 +225,9 @@ TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryDefaultValues) std::unique_ptr exporter(new OtlpGrpcMetricExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 5); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f); } TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryValuesFromEnv) @@ -240,9 +240,9 @@ TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryValuesFromEnv) std::unique_ptr exporter(new OtlpGrpcMetricExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 123); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f); unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_ATTEMPTS"); unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_INITIAL_BACKOFF"); @@ -260,9 +260,9 @@ TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryGenericValuesFromEnv) std::unique_ptr exporter(new OtlpGrpcMetricExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 321); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f); unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS"); unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF"); diff --git a/exporters/otlp/test/otlp_http_exporter_test.cc b/exporters/otlp/test/otlp_http_exporter_test.cc index 3cb081ba98..c9a3b6901a 100644 --- a/exporters/otlp/test/otlp_http_exporter_test.cc +++ b/exporters/otlp/test/otlp_http_exporter_test.cc @@ -640,9 +640,9 @@ TEST_F(OtlpHttpExporterTestPeer, ConfigRetryDefaultValues) std::unique_ptr exporter(new OtlpHttpExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 5); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f); } TEST_F(OtlpHttpExporterTestPeer, ConfigRetryValuesFromEnv) @@ -655,9 +655,9 @@ TEST_F(OtlpHttpExporterTestPeer, ConfigRetryValuesFromEnv) std::unique_ptr exporter(new OtlpHttpExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 123); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f); unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_ATTEMPTS"); unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_INITIAL_BACKOFF"); @@ -675,9 +675,9 @@ TEST_F(OtlpHttpExporterTestPeer, ConfigRetryGenericValuesFromEnv) std::unique_ptr exporter(new OtlpHttpExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 321); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f); unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS"); unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF"); diff --git a/exporters/otlp/test/otlp_http_log_record_exporter_test.cc b/exporters/otlp/test/otlp_http_log_record_exporter_test.cc index 20e2aef71c..fd84953f8e 100644 --- a/exporters/otlp/test/otlp_http_log_record_exporter_test.cc +++ b/exporters/otlp/test/otlp_http_log_record_exporter_test.cc @@ -762,9 +762,9 @@ TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryDefaultValues) std::unique_ptr exporter(new OtlpHttpLogRecordExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 5); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f); } TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryValuesFromEnv) @@ -777,9 +777,9 @@ TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryValuesFromEnv) std::unique_ptr exporter(new OtlpHttpLogRecordExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 123); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f); unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_ATTEMPTS"); unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_INITIAL_BACKOFF"); @@ -797,9 +797,9 @@ TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryGenericValuesFromEnv) std::unique_ptr exporter(new OtlpHttpLogRecordExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 321); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f); unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS"); unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF"); diff --git a/exporters/otlp/test/otlp_http_metric_exporter_test.cc b/exporters/otlp/test/otlp_http_metric_exporter_test.cc index 237f59ccba..d1ca0572ae 100644 --- a/exporters/otlp/test/otlp_http_metric_exporter_test.cc +++ b/exporters/otlp/test/otlp_http_metric_exporter_test.cc @@ -1017,9 +1017,9 @@ TEST_F(OtlpHttpMetricExporterTestPeer, ConfigRetryDefaultValues) std::unique_ptr exporter(new OtlpHttpMetricExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 5); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f); } TEST_F(OtlpHttpMetricExporterTestPeer, ConfigRetryValuesFromEnv) @@ -1032,9 +1032,9 @@ TEST_F(OtlpHttpMetricExporterTestPeer, ConfigRetryValuesFromEnv) std::unique_ptr exporter(new OtlpHttpMetricExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 123); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f); unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_ATTEMPTS"); unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_INITIAL_BACKOFF"); @@ -1052,9 +1052,9 @@ TEST_F(OtlpHttpMetricExporterTestPeer, ConfigRetryGenericValuesFromEnv) std::unique_ptr exporter(new OtlpHttpMetricExporter()); const auto options = GetOptions(exporter); ASSERT_EQ(options.retry_policy_max_attempts, 321); - ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4); - ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6); - ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8); + ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f); + ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f); + ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f); unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS"); unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF"); diff --git a/ext/src/http/client/curl/http_client_curl.cc b/ext/src/http/client/curl/http_client_curl.cc index a65410d058..c22ce539db 100644 --- a/ext/src/http/client/curl/http_client_curl.cc +++ b/ext/src/http/client/curl/http_client_curl.cc @@ -475,7 +475,7 @@ bool HttpClient::MaybeSpawnBackgroundThread() #endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */ // curl_multi_poll is added from libcurl 7.66.0, before 7.68.0, we can only wait until - // timeout to do the rest jobs + // timeout to do the remaining jobs #if LIBCURL_VERSION_NUM >= 0x074200 /* wait for activity, timeout or "nothing" */ mc = curl_multi_poll(self->multi_handle_, nullptr, 0, @@ -646,16 +646,16 @@ void HttpClient::ScheduleAddSession(uint64_t session_id) void HttpClient::ScheduleAbortSession(uint64_t session_id) { { - std::lock_guard lock_guard{sessions_m_}; + std::lock_guard sessions_lock{sessions_m_}; auto session = sessions_.find(session_id); if (session == sessions_.end()) { - std::lock_guard lock_guard{session_ids_m_}; + std::lock_guard session_ids_lock{session_ids_m_}; pending_to_add_session_ids_.erase(session_id); } else { - std::lock_guard lock_guard{session_ids_m_}; + std::lock_guard session_ids_lock{session_ids_m_}; pending_to_abort_sessions_[session_id] = std::move(session->second); pending_to_add_session_ids_.erase(session_id); diff --git a/ext/src/http/client/curl/http_operation_curl.cc b/ext/src/http/client/curl/http_operation_curl.cc index 24ba688040..b1e5e4c9ad 100644 --- a/ext/src/http/client/curl/http_operation_curl.cc +++ b/ext/src/http/client/curl/http_operation_curl.cc @@ -464,7 +464,7 @@ std::chrono::system_clock::time_point HttpOperation::NextRetryTime() { static std::random_device rd; static std::mt19937 gen(rd()); - static std::uniform_real_distribution dis(0.8, 1.2); + static std::uniform_real_distribution dis(0.8f, 1.2f); // The initial retry attempt will occur after initialBackoff * random(0.8, 1.2) auto backoff = retry_policy_.initial_backoff; @@ -1043,7 +1043,7 @@ CURLcode HttpOperation::Setup() // TODO: control local port to use // curl_easy_setopt(curl, CURLOPT_LOCALPORT, dcf_port); - rc = SetCurlLongOption(CURLOPT_TIMEOUT_MS, http_conn_timeout_.count()); + rc = SetCurlLongOption(CURLOPT_TIMEOUT_MS, static_cast(http_conn_timeout_.count())); if (rc != CURLE_OK) { return rc;