Skip to content

Commit 6e8a803

Browse files
dbarkerdbarker
authored
[CI] update do_ci scripts to use common cmake cache scripts (open-telemetry#3582)
* update ci scripts to use the test_common/cmake cache variable scripts * re-disable opentracing for maintainer tests * fix ci issues. Maintainer build warnings on windows. CMake configure failure with dll build * fix ci issues. W3C trace context test warnings failing windows maintainer builds ---------
1 parent 6aece9b commit 6e8a803

File tree

6 files changed

+55
-156
lines changed

6 files changed

+55
-156
lines changed

‎ci/do_ci.ps1

Lines changed: 16 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,8 @@ switch ($action) {
110110
"cmake.maintainer.test" {
111111
cd "$BUILD_DIR"
112112
cmake $SRC_DIR `
113-
-DWITH_OTLP_GRPC=ON `
114-
-DWITH_OTLP_HTTP=ON `
115-
-DWITH_OTLP_RETRY_PREVIEW=ON `
113+
"-C $SRC_DIR/test_common/cmake/all-options-abiv1-preview.cmake" `
114+
-DWITH_OPENTRACING=OFF `
116115
-DOTELCPP_MAINTAINER_MODE=ON `
117116
-DWITH_NO_DEPRECATED_CODE=ON `
118117
-DVCPKG_TARGET_TRIPLET=x64-windows `
@@ -135,11 +134,10 @@ switch ($action) {
135134
"cmake.maintainer.cxx20.stl.test" {
136135
cd "$BUILD_DIR"
137136
cmake $SRC_DIR `
137+
"-C $SRC_DIR/test_common/cmake/all-options-abiv1-preview.cmake" `
138+
-DWITH_OPENTRACING=OFF `
138139
-DWITH_STL=CXX20 `
139140
-DCMAKE_CXX_STANDARD=20 `
140-
-DWITH_OTLP_GRPC=ON `
141-
-DWITH_OTLP_HTTP=ON `
142-
-DWITH_OTLP_RETRY_PREVIEW=ON `
143141
-DOTELCPP_MAINTAINER_MODE=ON `
144142
-DWITH_NO_DEPRECATED_CODE=ON `
145143
-DVCPKG_TARGET_TRIPLET=x64-windows `
@@ -162,13 +160,10 @@ switch ($action) {
162160
"cmake.maintainer.abiv2.test" {
163161
cd "$BUILD_DIR"
164162
cmake $SRC_DIR `
165-
-DWITH_OTLP_GRPC=ON `
166-
-DWITH_OTLP_HTTP=ON `
167-
-DWITH_OTLP_RETRY_PREVIEW=ON `
163+
"-C $SRC_DIR/test_common/cmake/all-options-abiv2-preview.cmake" `
164+
-DWITH_OPENTRACING=OFF `
168165
-DOTELCPP_MAINTAINER_MODE=ON `
169166
-DWITH_NO_DEPRECATED_CODE=ON `
170-
-DWITH_ABI_VERSION_1=OFF `
171-
-DWITH_ABI_VERSION_2=ON `
172167
-DVCPKG_TARGET_TRIPLET=x64-windows `
173168
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
174169
$exit = $LASTEXITCODE
@@ -210,11 +205,9 @@ switch ($action) {
210205
"cmake.exporter.otprotocol.test" {
211206
cd "$BUILD_DIR"
212207
cmake $SRC_DIR `
213-
-DVCPKG_TARGET_TRIPLET=x64-windows `
214-
-DWITH_OTLP_GRPC=ON `
215-
-DWITH_OTLP_HTTP=ON `
216-
-DWITH_OTLP_RETRY_PREVIEW=ON `
217-
-DWITH_OTPROTCOL=ON `
208+
"-C $SRC_DIR/test_common/cmake/all-options-abiv1-preview.cmake" `
209+
-DWITH_OPENTRACING=OFF `
210+
-DVCPKG_TARGET_TRIPLET=x64-windows `
218211
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
219212
$exit = $LASTEXITCODE
220213
if ($exit -ne 0) {
@@ -257,9 +250,10 @@ switch ($action) {
257250
"cmake.exporter.otprotocol.with_async_export.test" {
258251
cd "$BUILD_DIR"
259252
cmake $SRC_DIR `
253+
"-C $SRC_DIR/test_common/cmake/all-options-abiv1-preview.cmake" `
254+
-DWITH_OPENTRACING=OFF `
260255
-DVCPKG_TARGET_TRIPLET=x64-windows `
261256
-DWITH_ASYNC_EXPORT_PREVIEW=ON `
262-
-DWITH_OTPROTCOL=ON `
263257
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
264258
$exit = $LASTEXITCODE
265259
if ($exit -ne 0) {
@@ -342,27 +336,9 @@ switch ($action) {
342336
cmake $SRC_DIR `
343337
$CMAKE_OPTIONS `
344338
"-DCMAKE_INSTALL_PREFIX=$INSTALL_TEST_DIR" `
345-
-DWITH_ABI_VERSION_1=OFF `
346-
-DWITH_ABI_VERSION_2=ON `
339+
"-C $SRC_DIR/test_common/cmake/all-options-abiv2-preview.cmake" `
340+
-DWITH_OPENTRACING=OFF `
347341
-DWITH_GSL=ON `
348-
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON `
349-
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON `
350-
-DWITH_ASYNC_EXPORT_PREVIEW=ON `
351-
-DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=ON `
352-
-DWITH_OTLP_GRPC_CREDENTIAL_PREVIEW=ON `
353-
-DWITH_OTLP_RETRY_PREVIEW=ON `
354-
-DWITH_OTLP_GRPC=ON `
355-
-DWITH_OTLP_HTTP=ON `
356-
-DWITH_OTLP_FILE=ON `
357-
-DWITH_OTLP_HTTP_COMPRESSION=ON `
358-
-DWITH_HTTP_CLIENT_CURL=ON `
359-
-DWITH_PROMETHEUS=ON `
360-
-DWITH_ZIPKIN=ON `
361-
-DWITH_ELASTICSEARCH=ON `
362-
-DWITH_ETW=ON `
363-
-DWITH_EXAMPLES=ON `
364-
-DWITH_EXAMPLES_HTTP=ON `
365-
-DBUILD_W3CTRACECONTEXT_TEST=ON `
366342
-DOPENTELEMETRY_INSTALL=ON
367343

368344
$exit = $LASTEXITCODE
@@ -447,13 +423,9 @@ switch ($action) {
447423
cmake $SRC_DIR `
448424
$CMAKE_OPTIONS `
449425
"-DCMAKE_INSTALL_PREFIX=$INSTALL_TEST_DIR" `
450-
-DWITH_ABI_VERSION_1=ON `
451-
-DWITH_ABI_VERSION_2=OFF `
452-
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON `
453-
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON `
454-
-DWITH_ASYNC_EXPORT_PREVIEW=ON `
455-
-DWITH_ETW=ON `
426+
"-C $SRC_DIR/test_common/cmake/all-options-abiv1-preview.cmake" `
456427
-DOPENTELEMETRY_INSTALL=ON `
428+
-DWITH_OPENTRACING=OFF `
457429
-DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=OFF `
458430
-DWITH_OTLP_GRPC_CREDENTIAL_PREVIEW=OFF `
459431
-DWITH_OTLP_RETRY_PREVIEW=OFF `
@@ -466,6 +438,7 @@ switch ($action) {
466438
-DWITH_ZIPKIN=OFF `
467439
-DWITH_ELASTICSEARCH=OFF `
468440
-DWITH_EXAMPLES=OFF `
441+
-DWITH_EXAMPLES_HTTP=OFF
469442

470443
$exit = $LASTEXITCODE
471444
if ($exit -ne 0) {

‎ci/do_ci.sh

Lines changed: 10 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -124,22 +124,11 @@ elif [[ "$1" == "cmake.maintainer.sync.test" ]]; then
124124
cd "${BUILD_DIR}"
125125
rm -rf *
126126
cmake "${CMAKE_OPTIONS[@]}" \
127-
-DWITH_OTLP_HTTP=ON \
128-
-DWITH_OTLP_GRPC=ON \
129-
-DWITH_OTLP_FILE=ON \
130-
-DWITH_PROMETHEUS=ON \
131-
-DWITH_EXAMPLES=ON \
132-
-DWITH_EXAMPLES_HTTP=ON \
133-
-DWITH_ZIPKIN=ON \
134-
-DBUILD_W3CTRACECONTEXT_TEST=ON \
135-
-DWITH_ELASTICSEARCH=ON \
136-
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
127+
-C ${SRC_DIR}/test_common/cmake/all-options-abiv1-preview.cmake \
128+
-DWITH_OPENTRACING=OFF \
137129
-DWITH_ASYNC_EXPORT_PREVIEW=OFF \
138130
-DOTELCPP_MAINTAINER_MODE=ON \
139131
-DWITH_NO_DEPRECATED_CODE=ON \
140-
-DWITH_OTLP_HTTP_COMPRESSION=ON \
141-
-DWITH_OTLP_RETRY_PREVIEW=ON \
142-
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
143132
"${SRC_DIR}"
144133
eval "$MAKE_COMMAND"
145134
make test
@@ -148,22 +137,10 @@ elif [[ "$1" == "cmake.maintainer.async.test" ]]; then
148137
cd "${BUILD_DIR}"
149138
rm -rf *
150139
cmake "${CMAKE_OPTIONS[@]}" \
151-
-DWITH_OTLP_HTTP=ON \
152-
-DWITH_OTLP_GRPC=ON \
153-
-DWITH_OTLP_FILE=ON \
154-
-DWITH_PROMETHEUS=ON \
155-
-DWITH_EXAMPLES=ON \
156-
-DWITH_EXAMPLES_HTTP=ON \
157-
-DWITH_ZIPKIN=ON \
158-
-DBUILD_W3CTRACECONTEXT_TEST=ON \
159-
-DWITH_ELASTICSEARCH=ON \
160-
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
161-
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
140+
-C ${SRC_DIR}/test_common/cmake/all-options-abiv1-preview.cmake \
141+
-DWITH_OPENTRACING=OFF \
162142
-DOTELCPP_MAINTAINER_MODE=ON \
163143
-DWITH_NO_DEPRECATED_CODE=ON \
164-
-DWITH_OTLP_HTTP_COMPRESSION=ON \
165-
-DWITH_OTLP_RETRY_PREVIEW=ON \
166-
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
167144
"${SRC_DIR}"
168145
eval "$MAKE_COMMAND"
169146
make test
@@ -173,21 +150,10 @@ elif [[ "$1" == "cmake.maintainer.cpp11.async.test" ]]; then
173150
rm -rf *
174151
cmake "${CMAKE_OPTIONS[@]}" \
175152
-DCMAKE_CXX_STANDARD=11 \
176-
-DWITH_OTLP_HTTP=ON \
177-
-DWITH_OTLP_FILE=ON \
178-
-DWITH_PROMETHEUS=ON \
179-
-DWITH_EXAMPLES=ON \
180-
-DWITH_EXAMPLES_HTTP=ON \
181-
-DWITH_ZIPKIN=ON \
182-
-DBUILD_W3CTRACECONTEXT_TEST=ON \
183-
-DWITH_ELASTICSEARCH=ON \
184-
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
185-
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
153+
-C ${SRC_DIR}/test_common/cmake/all-options-abiv1-preview.cmake \
154+
-DWITH_OPENTRACING=OFF \
186155
-DOTELCPP_MAINTAINER_MODE=ON \
187156
-DWITH_NO_DEPRECATED_CODE=ON \
188-
-DWITH_OTLP_HTTP_COMPRESSION=ON \
189-
-DWITH_OTLP_RETRY_PREVIEW=ON \
190-
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
191157
"${SRC_DIR}"
192158
make -k -j $(nproc)
193159
make test
@@ -196,24 +162,11 @@ elif [[ "$1" == "cmake.maintainer.abiv2.test" ]]; then
196162
cd "${BUILD_DIR}"
197163
rm -rf *
198164
cmake "${CMAKE_OPTIONS[@]}" \
199-
-DWITH_OTLP_HTTP=ON \
200-
-DWITH_OTLP_GRPC=ON \
201-
-DWITH_OTLP_FILE=ON \
202-
-DWITH_PROMETHEUS=ON \
203-
-DWITH_EXAMPLES=ON \
204-
-DWITH_EXAMPLES_HTTP=ON \
205-
-DWITH_ZIPKIN=ON \
206-
-DBUILD_W3CTRACECONTEXT_TEST=ON \
207-
-DWITH_ELASTICSEARCH=ON \
208-
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
165+
-C ${SRC_DIR}/test_common/cmake/all-options-abiv2-preview.cmake \
166+
-DWITH_OPENTRACING=OFF \
209167
-DWITH_ASYNC_EXPORT_PREVIEW=OFF \
210168
-DOTELCPP_MAINTAINER_MODE=ON \
211169
-DWITH_NO_DEPRECATED_CODE=ON \
212-
-DWITH_ABI_VERSION_1=OFF \
213-
-DWITH_ABI_VERSION_2=ON \
214-
-DWITH_OTLP_HTTP_COMPRESSION=ON \
215-
-DWITH_OTLP_RETRY_PREVIEW=ON \
216-
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
217170
"${SRC_DIR}"
218171
eval "$MAKE_COMMAND"
219172
make test
@@ -465,25 +418,7 @@ elif [[ "$1" == "cmake.install.test" ]]; then
465418

466419
cmake "${CMAKE_OPTIONS[@]}" \
467420
-DCMAKE_INSTALL_PREFIX=${INSTALL_TEST_DIR} \
468-
-DWITH_ABI_VERSION_1=OFF \
469-
-DWITH_ABI_VERSION_2=ON \
470-
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
471-
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
472-
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
473-
-DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=ON \
474-
-DWITH_OTLP_GRPC_CREDENTIAL_PREVIEW=ON \
475-
-DWITH_OTLP_RETRY_PREVIEW=ON \
476-
-DWITH_OTLP_GRPC=ON \
477-
-DWITH_OTLP_HTTP=ON \
478-
-DWITH_OTLP_FILE=ON \
479-
-DWITH_OTLP_HTTP_COMPRESSION=ON \
480-
-DWITH_HTTP_CLIENT_CURL=ON \
481-
-DWITH_PROMETHEUS=ON \
482-
-DWITH_ZIPKIN=ON \
483-
-DWITH_ELASTICSEARCH=ON \
484-
-DWITH_EXAMPLES=ON \
485-
-DWITH_EXAMPLES_HTTP=ON \
486-
-DBUILD_W3CTRACECONTEXT_TEST=ON \
421+
-C ${SRC_DIR}/test_common/cmake/all-options-abiv2-preview.cmake \
487422
-DOPENTELEMETRY_INSTALL=ON \
488423
"${SRC_DIR}"
489424

@@ -533,25 +468,7 @@ elif [[ "$1" == "cmake.fetch_content.test" ]]; then
533468
rm -rf *
534469
cmake "${CMAKE_OPTIONS[@]}" \
535470
-DCMAKE_INSTALL_PREFIX=${INSTALL_TEST_DIR} \
536-
-DWITH_ABI_VERSION_1=OFF \
537-
-DWITH_ABI_VERSION_2=ON \
538-
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
539-
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
540-
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
541-
-DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=ON \
542-
-DWITH_OTLP_GRPC_CREDENTIAL_PREVIEW=ON \
543-
-DWITH_OTLP_RETRY_PREVIEW=ON \
544-
-DWITH_OTLP_GRPC=ON \
545-
-DWITH_OTLP_HTTP=ON \
546-
-DWITH_OTLP_FILE=ON \
547-
-DWITH_OTLP_HTTP_COMPRESSION=ON \
548-
-DWITH_HTTP_CLIENT_CURL=ON \
549-
-DWITH_PROMETHEUS=ON \
550-
-DWITH_ZIPKIN=ON \
551-
-DWITH_ELASTICSEARCH=ON \
552-
-DWITH_EXAMPLES=ON \
553-
-DWITH_EXAMPLES_HTTP=ON \
554-
-DBUILD_W3CTRACECONTEXT_TEST=ON \
471+
-C ${SRC_DIR}/test_common/cmake/all-options-abiv2-preview.cmake \
555472
-DOPENTELEMETRY_INSTALL=OFF \
556473
-DOPENTELEMETRY_CPP_SRC_DIR="${SRC_DIR}" \
557474
"${SRC_DIR}/install/test/cmake/fetch_content_test"

‎exporters/otlp/test/otlp_file_metric_exporter_test.cc

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@ class OtlpFileMetricExporterTestPeer : public ::testing::Test
9595
opentelemetry::sdk::resource::ResourceAttributes{}, "resource_url");
9696
data.resource_ = &resource;
9797

98-
auto scope = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
99-
"library_name", "1.5.0", "scope_url", {{"scope_key", "scope_value"}});
98+
auto instrumentation_scope =
99+
opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
100+
"library_name", "1.5.0", "scope_url", {{"scope_key", "scope_value"}});
100101

101102
opentelemetry::sdk::metrics::MetricData metric_data{
102103
opentelemetry::sdk::metrics::InstrumentDescriptor{
@@ -110,7 +111,8 @@ class OtlpFileMetricExporterTestPeer : public ::testing::Test
110111
{opentelemetry::sdk::metrics::PointAttributes{{"a2", "b2"}}, sum_point_data2}}};
111112

112113
data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
113-
{scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
114+
{instrumentation_scope.get(),
115+
std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
114116

115117
auto result = exporter->Export(data);
116118
EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
@@ -180,10 +182,12 @@ class OtlpFileMetricExporterTestPeer : public ::testing::Test
180182
auto resource = opentelemetry::sdk::resource::Resource::Create(
181183
opentelemetry::sdk::resource::ResourceAttributes{});
182184
data.resource_ = &resource;
183-
auto scope = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
184-
"library_name", "1.5.0");
185+
auto instrumentation_scope =
186+
opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("library_name",
187+
"1.5.0");
185188
data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
186-
{scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
189+
{instrumentation_scope.get(),
190+
std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
187191

188192
auto result = exporter->Export(data);
189193
EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
@@ -250,10 +254,12 @@ class OtlpFileMetricExporterTestPeer : public ::testing::Test
250254
auto resource = opentelemetry::sdk::resource::Resource::Create(
251255
opentelemetry::sdk::resource::ResourceAttributes{});
252256
data.resource_ = &resource;
253-
auto scope = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
254-
"library_name", "1.5.0");
257+
auto instrumentation_scope =
258+
opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("library_name",
259+
"1.5.0");
255260
data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
256-
{scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
261+
{instrumentation_scope.get(),
262+
std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
257263

258264
auto result = exporter->Export(data);
259265
EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);

‎exporters/prometheus/test/exporter_utils_test.cc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,18 +102,21 @@ void assert_basic(prometheus_client::MetricFamily &metric,
102102
switch (type)
103103
{
104104
case prometheus_client::MetricType::Counter: {
105-
ASSERT_DOUBLE_EQ(metric_data.counter.value, vals[0]);
105+
ASSERT_DOUBLE_EQ(static_cast<double>(metric_data.counter.value),
106+
static_cast<double>(vals[0]));
106107
break;
107108
}
108109
case prometheus_client::MetricType::Histogram: {
109-
ASSERT_DOUBLE_EQ(metric_data.histogram.sample_count, vals[0]);
110-
ASSERT_DOUBLE_EQ(metric_data.histogram.sample_sum, vals[1]);
110+
ASSERT_DOUBLE_EQ(static_cast<double>(metric_data.histogram.sample_count),
111+
static_cast<double>(vals[0]));
112+
ASSERT_DOUBLE_EQ(static_cast<double>(metric_data.histogram.sample_sum),
113+
static_cast<double>(vals[1]));
111114
auto buckets = metric_data.histogram.bucket;
112115
ASSERT_EQ(buckets.size(), vals[2]);
113116
break;
114117
}
115118
case prometheus_client::MetricType::Gauge: {
116-
ASSERT_DOUBLE_EQ(metric_data.gauge.value, vals[0]);
119+
ASSERT_DOUBLE_EQ(static_cast<double>(metric_data.gauge.value), static_cast<double>(vals[0]));
117120
break;
118121
}
119122
break;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ int deflateInPlace(z_stream *strm, unsigned char *buf, uint32_t len, uint32_t *m
101101
have = 0;
102102
while (ret == Z_OK)
103103
{
104-
strm->avail_out =
105-
strm->avail_in ? strm->next_in - strm->next_out : (buf + *max_len) - strm->next_out;
104+
strm->avail_out = static_cast<decltype(z_stream::avail_out)>(
105+
strm->avail_in ? strm->next_in - strm->next_out : (buf + *max_len) - strm->next_out);
106106
ret = deflate(strm, Z_FINISH);
107107
}
108108
if (ret != Z_BUF_ERROR || strm->avail_in == 0)
109109
{
110-
*max_len = strm->next_out - buf;
110+
*max_len = static_cast<uint32_t>(strm->next_out - buf);
111111
return ret == Z_STREAM_END ? Z_OK : ret;
112112
}
113113
}
@@ -130,10 +130,10 @@ int deflateInPlace(z_stream *strm, unsigned char *buf, uint32_t len, uint32_t *m
130130
std::memcpy(buf, temp.data(), have);
131131
strm->next_out = buf + have;
132132
}
133-
strm->avail_out = (buf + *max_len) - strm->next_out;
133+
strm->avail_out = static_cast<decltype(z_stream::avail_out)>((buf + *max_len) - strm->next_out);
134134
ret = deflate(strm, Z_FINISH);
135135
strm->zfree(strm->opaque, hold);
136-
*max_len = strm->next_out - buf;
136+
*max_len = static_cast<uint32_t>(strm->next_out - buf);
137137
return ret == Z_OK ? Z_BUF_ERROR : (ret == Z_STREAM_END ? Z_OK : ret);
138138
}
139139
#endif // ENABLE_OTLP_COMPRESSION_PREVIEW

0 commit comments

Comments
 (0)