Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 16 additions & 43 deletions ci/do_ci.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,8 @@ switch ($action) {
"cmake.maintainer.test" {
cd "$BUILD_DIR"
cmake $SRC_DIR `
-DWITH_OTLP_GRPC=ON `
-DWITH_OTLP_HTTP=ON `
-DWITH_OTLP_RETRY_PREVIEW=ON `
"-C $SRC_DIR/test_common/cmake/all-options-abiv1-preview.cmake" `
-DWITH_OPENTRACING=OFF `
-DOTELCPP_MAINTAINER_MODE=ON `
-DWITH_NO_DEPRECATED_CODE=ON `
-DVCPKG_TARGET_TRIPLET=x64-windows `
Expand All @@ -135,11 +134,10 @@ switch ($action) {
"cmake.maintainer.cxx20.stl.test" {
cd "$BUILD_DIR"
cmake $SRC_DIR `
"-C $SRC_DIR/test_common/cmake/all-options-abiv1-preview.cmake" `
-DWITH_OPENTRACING=OFF `
-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 `
Expand All @@ -162,13 +160,10 @@ switch ($action) {
"cmake.maintainer.abiv2.test" {
cd "$BUILD_DIR"
cmake $SRC_DIR `
-DWITH_OTLP_GRPC=ON `
-DWITH_OTLP_HTTP=ON `
-DWITH_OTLP_RETRY_PREVIEW=ON `
"-C $SRC_DIR/test_common/cmake/all-options-abiv2-preview.cmake" `
-DWITH_OPENTRACING=OFF `
-DOTELCPP_MAINTAINER_MODE=ON `
-DWITH_NO_DEPRECATED_CODE=ON `
-DWITH_ABI_VERSION_1=OFF `
-DWITH_ABI_VERSION_2=ON `
-DVCPKG_TARGET_TRIPLET=x64-windows `
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
$exit = $LASTEXITCODE
Expand Down Expand Up @@ -210,11 +205,9 @@ switch ($action) {
"cmake.exporter.otprotocol.test" {
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 `
"-C $SRC_DIR/test_common/cmake/all-options-abiv1-preview.cmake" `
-DWITH_OPENTRACING=OFF `
-DVCPKG_TARGET_TRIPLET=x64-windows `
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
$exit = $LASTEXITCODE
if ($exit -ne 0) {
Expand Down Expand Up @@ -257,9 +250,10 @@ switch ($action) {
"cmake.exporter.otprotocol.with_async_export.test" {
cd "$BUILD_DIR"
cmake $SRC_DIR `
"-C $SRC_DIR/test_common/cmake/all-options-abiv1-preview.cmake" `
-DWITH_OPENTRACING=OFF `
-DVCPKG_TARGET_TRIPLET=x64-windows `
-DWITH_ASYNC_EXPORT_PREVIEW=ON `
-DWITH_OTPROTCOL=ON `
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
$exit = $LASTEXITCODE
if ($exit -ne 0) {
Expand Down Expand Up @@ -342,27 +336,9 @@ switch ($action) {
cmake $SRC_DIR `
$CMAKE_OPTIONS `
"-DCMAKE_INSTALL_PREFIX=$INSTALL_TEST_DIR" `
-DWITH_ABI_VERSION_1=OFF `
-DWITH_ABI_VERSION_2=ON `
"-C $SRC_DIR/test_common/cmake/all-options-abiv2-preview.cmake" `
-DWITH_OPENTRACING=OFF `
-DWITH_GSL=ON `
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON `
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON `
-DWITH_ASYNC_EXPORT_PREVIEW=ON `
-DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=ON `
-DWITH_OTLP_GRPC_CREDENTIAL_PREVIEW=ON `
-DWITH_OTLP_RETRY_PREVIEW=ON `
-DWITH_OTLP_GRPC=ON `
-DWITH_OTLP_HTTP=ON `
-DWITH_OTLP_FILE=ON `
-DWITH_OTLP_HTTP_COMPRESSION=ON `
-DWITH_HTTP_CLIENT_CURL=ON `
-DWITH_PROMETHEUS=ON `
-DWITH_ZIPKIN=ON `
-DWITH_ELASTICSEARCH=ON `
-DWITH_ETW=ON `
-DWITH_EXAMPLES=ON `
-DWITH_EXAMPLES_HTTP=ON `
-DBUILD_W3CTRACECONTEXT_TEST=ON `
-DOPENTELEMETRY_INSTALL=ON

$exit = $LASTEXITCODE
Expand Down Expand Up @@ -447,13 +423,9 @@ switch ($action) {
cmake $SRC_DIR `
$CMAKE_OPTIONS `
"-DCMAKE_INSTALL_PREFIX=$INSTALL_TEST_DIR" `
-DWITH_ABI_VERSION_1=ON `
-DWITH_ABI_VERSION_2=OFF `
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON `
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON `
-DWITH_ASYNC_EXPORT_PREVIEW=ON `
-DWITH_ETW=ON `
"-C $SRC_DIR/test_common/cmake/all-options-abiv1-preview.cmake" `
-DOPENTELEMETRY_INSTALL=ON `
-DWITH_OPENTRACING=OFF `
-DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=OFF `
-DWITH_OTLP_GRPC_CREDENTIAL_PREVIEW=OFF `
-DWITH_OTLP_RETRY_PREVIEW=OFF `
Expand All @@ -466,6 +438,7 @@ switch ($action) {
-DWITH_ZIPKIN=OFF `
-DWITH_ELASTICSEARCH=OFF `
-DWITH_EXAMPLES=OFF `
-DWITH_EXAMPLES_HTTP=OFF

$exit = $LASTEXITCODE
if ($exit -ne 0) {
Expand Down
103 changes: 10 additions & 93 deletions ci/do_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -124,22 +124,11 @@ elif [[ "$1" == "cmake.maintainer.sync.test" ]]; then
cd "${BUILD_DIR}"
rm -rf *
cmake "${CMAKE_OPTIONS[@]}" \
-DWITH_OTLP_HTTP=ON \
-DWITH_OTLP_GRPC=ON \
-DWITH_OTLP_FILE=ON \
-DWITH_PROMETHEUS=ON \
-DWITH_EXAMPLES=ON \
-DWITH_EXAMPLES_HTTP=ON \
-DWITH_ZIPKIN=ON \
-DBUILD_W3CTRACECONTEXT_TEST=ON \
-DWITH_ELASTICSEARCH=ON \
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-C ${SRC_DIR}/test_common/cmake/all-options-abiv1-preview.cmake \
-DWITH_OPENTRACING=OFF \
-DWITH_ASYNC_EXPORT_PREVIEW=OFF \
-DOTELCPP_MAINTAINER_MODE=ON \
-DWITH_NO_DEPRECATED_CODE=ON \
-DWITH_OTLP_HTTP_COMPRESSION=ON \
-DWITH_OTLP_RETRY_PREVIEW=ON \
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
"${SRC_DIR}"
eval "$MAKE_COMMAND"
make test
Expand All @@ -148,22 +137,10 @@ elif [[ "$1" == "cmake.maintainer.async.test" ]]; then
cd "${BUILD_DIR}"
rm -rf *
cmake "${CMAKE_OPTIONS[@]}" \
-DWITH_OTLP_HTTP=ON \
-DWITH_OTLP_GRPC=ON \
-DWITH_OTLP_FILE=ON \
-DWITH_PROMETHEUS=ON \
-DWITH_EXAMPLES=ON \
-DWITH_EXAMPLES_HTTP=ON \
-DWITH_ZIPKIN=ON \
-DBUILD_W3CTRACECONTEXT_TEST=ON \
-DWITH_ELASTICSEARCH=ON \
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
-C ${SRC_DIR}/test_common/cmake/all-options-abiv1-preview.cmake \
-DWITH_OPENTRACING=OFF \
-DOTELCPP_MAINTAINER_MODE=ON \
-DWITH_NO_DEPRECATED_CODE=ON \
-DWITH_OTLP_HTTP_COMPRESSION=ON \
-DWITH_OTLP_RETRY_PREVIEW=ON \
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
"${SRC_DIR}"
eval "$MAKE_COMMAND"
make test
Expand All @@ -173,21 +150,10 @@ elif [[ "$1" == "cmake.maintainer.cpp11.async.test" ]]; then
rm -rf *
cmake "${CMAKE_OPTIONS[@]}" \
-DCMAKE_CXX_STANDARD=11 \
-DWITH_OTLP_HTTP=ON \
-DWITH_OTLP_FILE=ON \
-DWITH_PROMETHEUS=ON \
-DWITH_EXAMPLES=ON \
-DWITH_EXAMPLES_HTTP=ON \
-DWITH_ZIPKIN=ON \
-DBUILD_W3CTRACECONTEXT_TEST=ON \
-DWITH_ELASTICSEARCH=ON \
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
-C ${SRC_DIR}/test_common/cmake/all-options-abiv1-preview.cmake \
-DWITH_OPENTRACING=OFF \
-DOTELCPP_MAINTAINER_MODE=ON \
-DWITH_NO_DEPRECATED_CODE=ON \
-DWITH_OTLP_HTTP_COMPRESSION=ON \
-DWITH_OTLP_RETRY_PREVIEW=ON \
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
"${SRC_DIR}"
make -k -j $(nproc)
make test
Expand All @@ -196,24 +162,11 @@ elif [[ "$1" == "cmake.maintainer.abiv2.test" ]]; then
cd "${BUILD_DIR}"
rm -rf *
cmake "${CMAKE_OPTIONS[@]}" \
-DWITH_OTLP_HTTP=ON \
-DWITH_OTLP_GRPC=ON \
-DWITH_OTLP_FILE=ON \
-DWITH_PROMETHEUS=ON \
-DWITH_EXAMPLES=ON \
-DWITH_EXAMPLES_HTTP=ON \
-DWITH_ZIPKIN=ON \
-DBUILD_W3CTRACECONTEXT_TEST=ON \
-DWITH_ELASTICSEARCH=ON \
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-C ${SRC_DIR}/test_common/cmake/all-options-abiv2-preview.cmake \
-DWITH_OPENTRACING=OFF \
-DWITH_ASYNC_EXPORT_PREVIEW=OFF \
-DOTELCPP_MAINTAINER_MODE=ON \
-DWITH_NO_DEPRECATED_CODE=ON \
-DWITH_ABI_VERSION_1=OFF \
-DWITH_ABI_VERSION_2=ON \
-DWITH_OTLP_HTTP_COMPRESSION=ON \
-DWITH_OTLP_RETRY_PREVIEW=ON \
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
"${SRC_DIR}"
eval "$MAKE_COMMAND"
make test
Expand Down Expand Up @@ -465,25 +418,7 @@ elif [[ "$1" == "cmake.install.test" ]]; then

cmake "${CMAKE_OPTIONS[@]}" \
-DCMAKE_INSTALL_PREFIX=${INSTALL_TEST_DIR} \
-DWITH_ABI_VERSION_1=OFF \
-DWITH_ABI_VERSION_2=ON \
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
-DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=ON \
-DWITH_OTLP_GRPC_CREDENTIAL_PREVIEW=ON \
-DWITH_OTLP_RETRY_PREVIEW=ON \
-DWITH_OTLP_GRPC=ON \
-DWITH_OTLP_HTTP=ON \
-DWITH_OTLP_FILE=ON \
-DWITH_OTLP_HTTP_COMPRESSION=ON \
-DWITH_HTTP_CLIENT_CURL=ON \
-DWITH_PROMETHEUS=ON \
-DWITH_ZIPKIN=ON \
-DWITH_ELASTICSEARCH=ON \
-DWITH_EXAMPLES=ON \
-DWITH_EXAMPLES_HTTP=ON \
-DBUILD_W3CTRACECONTEXT_TEST=ON \
-C ${SRC_DIR}/test_common/cmake/all-options-abiv2-preview.cmake \
-DOPENTELEMETRY_INSTALL=ON \
"${SRC_DIR}"

Expand Down Expand Up @@ -533,25 +468,7 @@ elif [[ "$1" == "cmake.fetch_content.test" ]]; then
rm -rf *
cmake "${CMAKE_OPTIONS[@]}" \
-DCMAKE_INSTALL_PREFIX=${INSTALL_TEST_DIR} \
-DWITH_ABI_VERSION_1=OFF \
-DWITH_ABI_VERSION_2=ON \
-DWITH_METRICS_EXEMPLAR_PREVIEW=ON \
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
-DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=ON \
-DWITH_OTLP_GRPC_CREDENTIAL_PREVIEW=ON \
-DWITH_OTLP_RETRY_PREVIEW=ON \
-DWITH_OTLP_GRPC=ON \
-DWITH_OTLP_HTTP=ON \
-DWITH_OTLP_FILE=ON \
-DWITH_OTLP_HTTP_COMPRESSION=ON \
-DWITH_HTTP_CLIENT_CURL=ON \
-DWITH_PROMETHEUS=ON \
-DWITH_ZIPKIN=ON \
-DWITH_ELASTICSEARCH=ON \
-DWITH_EXAMPLES=ON \
-DWITH_EXAMPLES_HTTP=ON \
-DBUILD_W3CTRACECONTEXT_TEST=ON \
-C ${SRC_DIR}/test_common/cmake/all-options-abiv2-preview.cmake \
-DOPENTELEMETRY_INSTALL=OFF \
-DOPENTELEMETRY_CPP_SRC_DIR="${SRC_DIR}" \
"${SRC_DIR}/install/test/cmake/fetch_content_test"
Expand Down
24 changes: 15 additions & 9 deletions exporters/otlp/test/otlp_file_metric_exporter_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,9 @@ class OtlpFileMetricExporterTestPeer : public ::testing::Test
opentelemetry::sdk::resource::ResourceAttributes{}, "resource_url");
data.resource_ = &resource;

auto scope = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
"library_name", "1.5.0", "scope_url", {{"scope_key", "scope_value"}});
auto instrumentation_scope =
opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
"library_name", "1.5.0", "scope_url", {{"scope_key", "scope_value"}});

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

data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
{scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
{instrumentation_scope.get(),
std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};

auto result = exporter->Export(data);
EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
Expand Down Expand Up @@ -180,10 +182,12 @@ class OtlpFileMetricExporterTestPeer : public ::testing::Test
auto resource = opentelemetry::sdk::resource::Resource::Create(
opentelemetry::sdk::resource::ResourceAttributes{});
data.resource_ = &resource;
auto scope = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
"library_name", "1.5.0");
auto instrumentation_scope =
opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("library_name",
"1.5.0");
data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
{scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
{instrumentation_scope.get(),
std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};

auto result = exporter->Export(data);
EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
Expand Down Expand Up @@ -250,10 +254,12 @@ class OtlpFileMetricExporterTestPeer : public ::testing::Test
auto resource = opentelemetry::sdk::resource::Resource::Create(
opentelemetry::sdk::resource::ResourceAttributes{});
data.resource_ = &resource;
auto scope = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
"library_name", "1.5.0");
auto instrumentation_scope =
opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("library_name",
"1.5.0");
data.scope_metric_data_ = std::vector<opentelemetry::sdk::metrics::ScopeMetrics>{
{scope.get(), std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};
{instrumentation_scope.get(),
std::vector<opentelemetry::sdk::metrics::MetricData>{metric_data}}};

auto result = exporter->Export(data);
EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
Expand Down
11 changes: 7 additions & 4 deletions exporters/prometheus/test/exporter_utils_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,21 @@ void assert_basic(prometheus_client::MetricFamily &metric,
switch (type)
{
case prometheus_client::MetricType::Counter: {
ASSERT_DOUBLE_EQ(metric_data.counter.value, vals[0]);
ASSERT_DOUBLE_EQ(static_cast<double>(metric_data.counter.value),
static_cast<double>(vals[0]));
break;
}
case prometheus_client::MetricType::Histogram: {
ASSERT_DOUBLE_EQ(metric_data.histogram.sample_count, vals[0]);
ASSERT_DOUBLE_EQ(metric_data.histogram.sample_sum, vals[1]);
ASSERT_DOUBLE_EQ(static_cast<double>(metric_data.histogram.sample_count),
static_cast<double>(vals[0]));
ASSERT_DOUBLE_EQ(static_cast<double>(metric_data.histogram.sample_sum),
static_cast<double>(vals[1]));
auto buckets = metric_data.histogram.bucket;
ASSERT_EQ(buckets.size(), vals[2]);
break;
}
case prometheus_client::MetricType::Gauge: {
ASSERT_DOUBLE_EQ(metric_data.gauge.value, vals[0]);
ASSERT_DOUBLE_EQ(static_cast<double>(metric_data.gauge.value), static_cast<double>(vals[0]));
break;
}
break;
Expand Down
10 changes: 5 additions & 5 deletions ext/src/http/client/curl/http_client_curl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,13 @@ int deflateInPlace(z_stream *strm, unsigned char *buf, uint32_t len, uint32_t *m
have = 0;
while (ret == Z_OK)
{
strm->avail_out =
strm->avail_in ? strm->next_in - strm->next_out : (buf + *max_len) - strm->next_out;
strm->avail_out = static_cast<decltype(z_stream::avail_out)>(
strm->avail_in ? strm->next_in - strm->next_out : (buf + *max_len) - strm->next_out);
ret = deflate(strm, Z_FINISH);
}
if (ret != Z_BUF_ERROR || strm->avail_in == 0)
{
*max_len = strm->next_out - buf;
*max_len = static_cast<uint32_t>(strm->next_out - buf);
return ret == Z_STREAM_END ? Z_OK : ret;
}
}
Expand All @@ -130,10 +130,10 @@ int deflateInPlace(z_stream *strm, unsigned char *buf, uint32_t len, uint32_t *m
std::memcpy(buf, temp.data(), have);
strm->next_out = buf + have;
}
strm->avail_out = (buf + *max_len) - strm->next_out;
strm->avail_out = static_cast<decltype(z_stream::avail_out)>((buf + *max_len) - strm->next_out);
ret = deflate(strm, Z_FINISH);
strm->zfree(strm->opaque, hold);
*max_len = strm->next_out - buf;
*max_len = static_cast<uint32_t>(strm->next_out - buf);
return ret == Z_OK ? Z_BUF_ERROR : (ret == Z_STREAM_END ? Z_OK : ret);
}
#endif // ENABLE_OTLP_COMPRESSION_PREVIEW
Expand Down
Loading
Loading