Skip to content

Commit 4698741

Browse files
RichardChukwuRichardChukwu
authored
Merge branch 'main' into main
2 parents d0f047e + 3ca3c76 commit 4698741

10 files changed

+76
-61
lines changed

‎ci/do_ci.ps1‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if (!(test-path plugin)) {
2525
}
2626
$PLUGIN_DIR = Join-Path "$SRC_DIR" "plugin"
2727

28-
$VCPKG_DIR = Join-Path "$SRC_DIR" "tools" "vcpkg"
28+
$VCPKG_DIR = Join-Path "$SRC_DIR" "tools/vcpkg"
2929

3030
$Env:CTEST_OUTPUT_ON_FAILURE = "1"
3131

@@ -135,6 +135,9 @@ switch ($action) {
135135
"cmake.maintainer.test" {
136136
cd "$BUILD_DIR"
137137
cmake $SRC_DIR `
138+
-DWITH_OTLP_GRPC=ON `
139+
-DWITH_OTLP_HTTP=ON `
140+
-DWITH_OTLP_RETRY_PREVIEW=ON `
138141
-DOTELCPP_MAINTAINER_MODE=ON `
139142
-DWITH_NO_DEPRECATED_CODE=ON `
140143
-DVCPKG_TARGET_TRIPLET=x64-windows `
@@ -159,6 +162,9 @@ switch ($action) {
159162
cmake $SRC_DIR `
160163
-DWITH_STL=CXX20 `
161164
-DCMAKE_CXX_STANDARD=20 `
165+
-DWITH_OTLP_GRPC=ON `
166+
-DWITH_OTLP_HTTP=ON `
167+
-DWITH_OTLP_RETRY_PREVIEW=ON `
162168
-DOTELCPP_MAINTAINER_MODE=ON `
163169
-DWITH_NO_DEPRECATED_CODE=ON `
164170
-DVCPKG_TARGET_TRIPLET=x64-windows `
@@ -203,6 +209,9 @@ switch ($action) {
203209
cd "$BUILD_DIR"
204210
cmake $SRC_DIR `
205211
-DVCPKG_TARGET_TRIPLET=x64-windows `
212+
-DWITH_OTLP_GRPC=ON `
213+
-DWITH_OTLP_HTTP=ON `
214+
-DWITH_OTLP_RETRY_PREVIEW=ON `
206215
-DWITH_OTPROTCOL=ON `
207216
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
208217
$exit = $LASTEXITCODE

‎ci/setup_windows_ci_environment.ps1‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,10 @@ $VCPKG_DIR = (Get-Item -Path ".\").FullName
1919
# nlohmann-json
2020
./vcpkg "--vcpkg-root=$VCPKG_DIR" install nlohmann-json:x64-windows
2121

22+
# grpc
23+
./vcpkg "--vcpkg-root=$VCPKG_DIR" install grpc:x64-windows
24+
25+
# curl
26+
./vcpkg "--vcpkg-root=$VCPKG_DIR" install curl:x64-windows
27+
2228
Pop-Location

‎exporters/otlp/test/otlp_grpc_exporter_test.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,9 @@ TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryDefaultValues)
359359
std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
360360
const auto options = GetOptions(exporter);
361361
ASSERT_EQ(options.retry_policy_max_attempts, 5);
362-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0);
363-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0);
364-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5);
362+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
363+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
364+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
365365
}
366366

367367
TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryValuesFromEnv)
@@ -374,9 +374,9 @@ TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryValuesFromEnv)
374374
std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
375375
const auto options = GetOptions(exporter);
376376
ASSERT_EQ(options.retry_policy_max_attempts, 123);
377-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5);
378-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7);
379-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9);
377+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
378+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
379+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
380380

381381
unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_ATTEMPTS");
382382
unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_INITIAL_BACKOFF");
@@ -394,9 +394,9 @@ TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryGenericValuesFromEnv)
394394
std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
395395
const auto options = GetOptions(exporter);
396396
ASSERT_EQ(options.retry_policy_max_attempts, 321);
397-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4);
398-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6);
399-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8);
397+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
398+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
399+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
400400

401401
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
402402
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF");

‎exporters/otlp/test/otlp_grpc_log_record_exporter_test.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -473,9 +473,9 @@ TEST_F(OtlpGrpcLogRecordExporterTestPeer, ConfigRetryDefaultValues)
473473
std::unique_ptr<OtlpGrpcLogRecordExporter> exporter(new OtlpGrpcLogRecordExporter());
474474
const auto options = GetOptions(exporter);
475475
ASSERT_EQ(options.retry_policy_max_attempts, 5);
476-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0);
477-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0);
478-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5);
476+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
477+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
478+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
479479
}
480480

481481
TEST_F(OtlpGrpcLogRecordExporterTestPeer, ConfigRetryValuesFromEnv)
@@ -488,9 +488,9 @@ TEST_F(OtlpGrpcLogRecordExporterTestPeer, ConfigRetryValuesFromEnv)
488488
std::unique_ptr<OtlpGrpcLogRecordExporter> exporter(new OtlpGrpcLogRecordExporter());
489489
const auto options = GetOptions(exporter);
490490
ASSERT_EQ(options.retry_policy_max_attempts, 123);
491-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5);
492-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7);
493-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9);
491+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
492+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
493+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
494494

495495
unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_ATTEMPTS");
496496
unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_INITIAL_BACKOFF");
@@ -508,9 +508,9 @@ TEST_F(OtlpGrpcLogRecordExporterTestPeer, ConfigRetryGenericValuesFromEnv)
508508
std::unique_ptr<OtlpGrpcLogRecordExporter> exporter(new OtlpGrpcLogRecordExporter());
509509
const auto options = GetOptions(exporter);
510510
ASSERT_EQ(options.retry_policy_max_attempts, 321);
511-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4);
512-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6);
513-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8);
511+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
512+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
513+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
514514

515515
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
516516
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF");

‎exporters/otlp/test/otlp_grpc_metric_exporter_test.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,9 @@ TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryDefaultValues)
225225
std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
226226
const auto options = GetOptions(exporter);
227227
ASSERT_EQ(options.retry_policy_max_attempts, 5);
228-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0);
229-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0);
230-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5);
228+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
229+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
230+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
231231
}
232232

233233
TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryValuesFromEnv)
@@ -240,9 +240,9 @@ TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryValuesFromEnv)
240240
std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
241241
const auto options = GetOptions(exporter);
242242
ASSERT_EQ(options.retry_policy_max_attempts, 123);
243-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5);
244-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7);
245-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9);
243+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
244+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
245+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
246246

247247
unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_ATTEMPTS");
248248
unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_INITIAL_BACKOFF");
@@ -260,9 +260,9 @@ TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryGenericValuesFromEnv)
260260
std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
261261
const auto options = GetOptions(exporter);
262262
ASSERT_EQ(options.retry_policy_max_attempts, 321);
263-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4);
264-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6);
265-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8);
263+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
264+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
265+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
266266

267267
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
268268
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF");

‎exporters/otlp/test/otlp_http_exporter_test.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -640,9 +640,9 @@ TEST_F(OtlpHttpExporterTestPeer, ConfigRetryDefaultValues)
640640
std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter());
641641
const auto options = GetOptions(exporter);
642642
ASSERT_EQ(options.retry_policy_max_attempts, 5);
643-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0);
644-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0);
645-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5);
643+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
644+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
645+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
646646
}
647647

648648
TEST_F(OtlpHttpExporterTestPeer, ConfigRetryValuesFromEnv)
@@ -655,9 +655,9 @@ TEST_F(OtlpHttpExporterTestPeer, ConfigRetryValuesFromEnv)
655655
std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter());
656656
const auto options = GetOptions(exporter);
657657
ASSERT_EQ(options.retry_policy_max_attempts, 123);
658-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5);
659-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7);
660-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9);
658+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
659+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
660+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
661661

662662
unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_ATTEMPTS");
663663
unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_INITIAL_BACKOFF");
@@ -675,9 +675,9 @@ TEST_F(OtlpHttpExporterTestPeer, ConfigRetryGenericValuesFromEnv)
675675
std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter());
676676
const auto options = GetOptions(exporter);
677677
ASSERT_EQ(options.retry_policy_max_attempts, 321);
678-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4);
679-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6);
680-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8);
678+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
679+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
680+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
681681

682682
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
683683
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF");

‎exporters/otlp/test/otlp_http_log_record_exporter_test.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -762,9 +762,9 @@ TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryDefaultValues)
762762
std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter());
763763
const auto options = GetOptions(exporter);
764764
ASSERT_EQ(options.retry_policy_max_attempts, 5);
765-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0);
766-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0);
767-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5);
765+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
766+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
767+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
768768
}
769769

770770
TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryValuesFromEnv)
@@ -777,9 +777,9 @@ TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryValuesFromEnv)
777777
std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter());
778778
const auto options = GetOptions(exporter);
779779
ASSERT_EQ(options.retry_policy_max_attempts, 123);
780-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5);
781-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7);
782-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9);
780+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
781+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
782+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
783783

784784
unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_ATTEMPTS");
785785
unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_INITIAL_BACKOFF");
@@ -797,9 +797,9 @@ TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryGenericValuesFromEnv)
797797
std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter());
798798
const auto options = GetOptions(exporter);
799799
ASSERT_EQ(options.retry_policy_max_attempts, 321);
800-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4);
801-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6);
802-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8);
800+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
801+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
802+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
803803

804804
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
805805
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF");

‎exporters/otlp/test/otlp_http_metric_exporter_test.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,9 +1017,9 @@ TEST_F(OtlpHttpMetricExporterTestPeer, ConfigRetryDefaultValues)
10171017
std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter());
10181018
const auto options = GetOptions(exporter);
10191019
ASSERT_EQ(options.retry_policy_max_attempts, 5);
1020-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0);
1021-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0);
1022-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5);
1020+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
1021+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
1022+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
10231023
}
10241024

10251025
TEST_F(OtlpHttpMetricExporterTestPeer, ConfigRetryValuesFromEnv)
@@ -1032,9 +1032,9 @@ TEST_F(OtlpHttpMetricExporterTestPeer, ConfigRetryValuesFromEnv)
10321032
std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter());
10331033
const auto options = GetOptions(exporter);
10341034
ASSERT_EQ(options.retry_policy_max_attempts, 123);
1035-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5);
1036-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7);
1037-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9);
1035+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
1036+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
1037+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
10381038

10391039
unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_ATTEMPTS");
10401040
unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_INITIAL_BACKOFF");
@@ -1052,9 +1052,9 @@ TEST_F(OtlpHttpMetricExporterTestPeer, ConfigRetryGenericValuesFromEnv)
10521052
std::unique_ptr<OtlpHttpMetricExporter> exporter(new OtlpHttpMetricExporter());
10531053
const auto options = GetOptions(exporter);
10541054
ASSERT_EQ(options.retry_policy_max_attempts, 321);
1055-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4);
1056-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6);
1057-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8);
1055+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
1056+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
1057+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
10581058

10591059
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
10601060
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF");

‎ext/src/http/client/curl/http_client_curl.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ bool HttpClient::MaybeSpawnBackgroundThread()
475475
#endif /* ENABLE_THREAD_INSTRUMENTATION_PREVIEW */
476476

477477
// curl_multi_poll is added from libcurl 7.66.0, before 7.68.0, we can only wait until
478-
// timeout to do the rest jobs
478+
// timeout to do the remaining jobs
479479
#if LIBCURL_VERSION_NUM >= 0x074200
480480
/* wait for activity, timeout or "nothing" */
481481
mc = curl_multi_poll(self->multi_handle_, nullptr, 0,
@@ -646,16 +646,16 @@ void HttpClient::ScheduleAddSession(uint64_t session_id)
646646
void HttpClient::ScheduleAbortSession(uint64_t session_id)
647647
{
648648
{
649-
std::lock_guard<std::mutex> lock_guard{sessions_m_};
649+
std::lock_guard<std::mutex> sessions_lock{sessions_m_};
650650
auto session = sessions_.find(session_id);
651651
if (session == sessions_.end())
652652
{
653-
std::lock_guard<std::recursive_mutex> lock_guard{session_ids_m_};
653+
std::lock_guard<std::recursive_mutex> session_ids_lock{session_ids_m_};
654654
pending_to_add_session_ids_.erase(session_id);
655655
}
656656
else
657657
{
658-
std::lock_guard<std::recursive_mutex> lock_guard{session_ids_m_};
658+
std::lock_guard<std::recursive_mutex> session_ids_lock{session_ids_m_};
659659
pending_to_abort_sessions_[session_id] = std::move(session->second);
660660
pending_to_add_session_ids_.erase(session_id);
661661

‎ext/src/http/client/curl/http_operation_curl.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ std::chrono::system_clock::time_point HttpOperation::NextRetryTime()
464464
{
465465
static std::random_device rd;
466466
static std::mt19937 gen(rd());
467-
static std::uniform_real_distribution<float> dis(0.8, 1.2);
467+
static std::uniform_real_distribution<float> dis(0.8f, 1.2f);
468468

469469
// The initial retry attempt will occur after initialBackoff * random(0.8, 1.2)
470470
auto backoff = retry_policy_.initial_backoff;
@@ -1043,7 +1043,7 @@ CURLcode HttpOperation::Setup()
10431043
// TODO: control local port to use
10441044
// curl_easy_setopt(curl, CURLOPT_LOCALPORT, dcf_port);
10451045

1046-
rc = SetCurlLongOption(CURLOPT_TIMEOUT_MS, http_conn_timeout_.count());
1046+
rc = SetCurlLongOption(CURLOPT_TIMEOUT_MS, static_cast<long>(http_conn_timeout_.count()));
10471047
if (rc != CURLE_OK)
10481048
{
10491049
return rc;

0 commit comments

Comments
 (0)