Skip to content

Commit 3cb2193

Browse files
malkiamalkia
authored
Merge pull request #179 from open-telemetry/main
[CI] OTLP in Windows builds (open-telemetry#3263)
2 parents 43b21b5 + 3ca3c76 commit 3cb2193

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
@@ -361,9 +361,9 @@ TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryDefaultValues)
361361
std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
362362
const auto options = GetOptions(exporter);
363363
ASSERT_EQ(options.retry_policy_max_attempts, 5);
364-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0);
365-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0);
366-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5);
364+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
365+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
366+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
367367
}
368368

369369
TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryValuesFromEnv)
@@ -376,9 +376,9 @@ TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryValuesFromEnv)
376376
std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
377377
const auto options = GetOptions(exporter);
378378
ASSERT_EQ(options.retry_policy_max_attempts, 123);
379-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5);
380-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7);
381-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9);
379+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
380+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
381+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
382382

383383
unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_ATTEMPTS");
384384
unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_INITIAL_BACKOFF");
@@ -396,9 +396,9 @@ TEST_F(OtlpGrpcExporterTestPeer, ConfigRetryGenericValuesFromEnv)
396396
std::unique_ptr<OtlpGrpcExporter> exporter(new OtlpGrpcExporter());
397397
const auto options = GetOptions(exporter);
398398
ASSERT_EQ(options.retry_policy_max_attempts, 321);
399-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4);
400-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6);
401-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8);
399+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
400+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
401+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
402402

403403
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
404404
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
@@ -227,9 +227,9 @@ TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryDefaultValues)
227227
std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
228228
const auto options = GetOptions(exporter);
229229
ASSERT_EQ(options.retry_policy_max_attempts, 5);
230-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0);
231-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0);
232-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5);
230+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
231+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
232+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
233233
}
234234

235235
TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryValuesFromEnv)
@@ -242,9 +242,9 @@ TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryValuesFromEnv)
242242
std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
243243
const auto options = GetOptions(exporter);
244244
ASSERT_EQ(options.retry_policy_max_attempts, 123);
245-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5);
246-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7);
247-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9);
245+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
246+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
247+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
248248

249249
unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_MAX_ATTEMPTS");
250250
unsetenv("OTEL_CPP_EXPORTER_OTLP_METRICS_RETRY_INITIAL_BACKOFF");
@@ -262,9 +262,9 @@ TEST_F(OtlpGrpcMetricExporterTestPeer, ConfigRetryGenericValuesFromEnv)
262262
std::unique_ptr<OtlpGrpcMetricExporter> exporter(new OtlpGrpcMetricExporter());
263263
const auto options = GetOptions(exporter);
264264
ASSERT_EQ(options.retry_policy_max_attempts, 321);
265-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4);
266-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6);
267-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8);
265+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
266+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
267+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
268268

269269
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
270270
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
@@ -642,9 +642,9 @@ TEST_F(OtlpHttpExporterTestPeer, ConfigRetryDefaultValues)
642642
std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter());
643643
const auto options = GetOptions(exporter);
644644
ASSERT_EQ(options.retry_policy_max_attempts, 5);
645-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0);
646-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0);
647-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5);
645+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
646+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
647+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
648648
}
649649

650650
TEST_F(OtlpHttpExporterTestPeer, ConfigRetryValuesFromEnv)
@@ -657,9 +657,9 @@ TEST_F(OtlpHttpExporterTestPeer, ConfigRetryValuesFromEnv)
657657
std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter());
658658
const auto options = GetOptions(exporter);
659659
ASSERT_EQ(options.retry_policy_max_attempts, 123);
660-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5);
661-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7);
662-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9);
660+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
661+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
662+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
663663

664664
unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_MAX_ATTEMPTS");
665665
unsetenv("OTEL_CPP_EXPORTER_OTLP_TRACES_RETRY_INITIAL_BACKOFF");
@@ -677,9 +677,9 @@ TEST_F(OtlpHttpExporterTestPeer, ConfigRetryGenericValuesFromEnv)
677677
std::unique_ptr<OtlpHttpExporter> exporter(new OtlpHttpExporter());
678678
const auto options = GetOptions(exporter);
679679
ASSERT_EQ(options.retry_policy_max_attempts, 321);
680-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4);
681-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6);
682-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8);
680+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
681+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
682+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
683683

684684
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
685685
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
@@ -764,9 +764,9 @@ TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryDefaultValues)
764764
std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter());
765765
const auto options = GetOptions(exporter);
766766
ASSERT_EQ(options.retry_policy_max_attempts, 5);
767-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0);
768-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0);
769-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5);
767+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 1.0f);
768+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 5.0f);
769+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 1.5f);
770770
}
771771

772772
TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryValuesFromEnv)
@@ -779,9 +779,9 @@ TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryValuesFromEnv)
779779
std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter());
780780
const auto options = GetOptions(exporter);
781781
ASSERT_EQ(options.retry_policy_max_attempts, 123);
782-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5);
783-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7);
784-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9);
782+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 4.5f);
783+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 6.7f);
784+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 8.9f);
785785

786786
unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_MAX_ATTEMPTS");
787787
unsetenv("OTEL_CPP_EXPORTER_OTLP_LOGS_RETRY_INITIAL_BACKOFF");
@@ -799,9 +799,9 @@ TEST_F(OtlpHttpLogRecordExporterTestPeer, ConfigRetryGenericValuesFromEnv)
799799
std::unique_ptr<OtlpHttpLogRecordExporter> exporter(new OtlpHttpLogRecordExporter());
800800
const auto options = GetOptions(exporter);
801801
ASSERT_EQ(options.retry_policy_max_attempts, 321);
802-
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4);
803-
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6);
804-
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8);
802+
ASSERT_FLOAT_EQ(options.retry_policy_initial_backoff.count(), 5.4f);
803+
ASSERT_FLOAT_EQ(options.retry_policy_max_backoff.count(), 7.6f);
804+
ASSERT_FLOAT_EQ(options.retry_policy_backoff_multiplier, 9.8f);
805805

806806
unsetenv("OTEL_CPP_EXPORTER_OTLP_RETRY_MAX_ATTEMPTS");
807807
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)