diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml index 0d0a5ed8f9..a9e5a46943 100644 --- a/.github/workflows/cppcheck.yml +++ b/.github/workflows/cppcheck.yml @@ -51,6 +51,7 @@ jobs: -i build \ -i test \ -i third_party \ + -i tools \ -j $(nproc) \ . 2>&1 | tee --append cppcheck.log diff --git a/CHANGELOG.md b/CHANGELOG.md index faa873c64f..6e4507a662 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,9 @@ Increment the: * [SDK] Fix typo in hashmap method GetEnteries [#3680](https://github.com/open-telemetry/opentelemetry-cpp/pull/3680) +* [CI] Upgrade tools/vcpkg to 2025.09.17 + [#3701](https://github.com/open-telemetry/opentelemetry-cpp/pull/3701) + ## [1.23 2025-09-25] * [CodeHealth] Fix clang-tidy warnings part 6 diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h b/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h index dc674ce9eb..ce2d4ce041 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h +++ b/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h @@ -21,6 +21,7 @@ # pragma warning(disable : 4251) # pragma warning(disable : 4267) # pragma warning(disable : 4668) +# pragma warning(disable : 4702) # pragma warning(disable : 4946) # pragma warning(disable : 6001) # pragma warning(disable : 6244) diff --git a/exporters/otlp/src/otlp_grpc_client.cc b/exporters/otlp/src/otlp_grpc_client.cc index a51740404f..b2000aadce 100644 --- a/exporters/otlp/src/otlp_grpc_client.cc +++ b/exporters/otlp/src/otlp_grpc_client.cc @@ -22,6 +22,9 @@ // clang-format off #include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep +#ifdef ENABLE_ASYNC_EXPORT +# include "google/protobuf/arena.h" +#endif /* ENABLE_ASYNC_EXPORT */ #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h" #include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h" #include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h" @@ -29,7 +32,6 @@ // clang-format on #ifdef ENABLE_ASYNC_EXPORT -# include # include # include # include diff --git a/exporters/otlp/src/otlp_grpc_exporter.cc b/exporters/otlp/src/otlp_grpc_exporter.cc index 0760658582..cd61dfae68 100644 --- a/exporters/otlp/src/otlp_grpc_exporter.cc +++ b/exporters/otlp/src/otlp_grpc_exporter.cc @@ -1,7 +1,6 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -#include #include #include #include @@ -27,6 +26,7 @@ // clang-format off #include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep +#include "google/protobuf/arena.h" #include "opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.h" #include "opentelemetry/proto/collector/trace/v1/trace_service.pb.h" #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep diff --git a/exporters/otlp/src/otlp_grpc_log_record_exporter.cc b/exporters/otlp/src/otlp_grpc_log_record_exporter.cc index 9725a3697d..712db424ef 100644 --- a/exporters/otlp/src/otlp_grpc_log_record_exporter.cc +++ b/exporters/otlp/src/otlp_grpc_log_record_exporter.cc @@ -1,7 +1,6 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -#include #include #include #include @@ -26,6 +25,7 @@ // clang-format off #include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep +#include "google/protobuf/arena.h" #include "opentelemetry/proto/collector/logs/v1/logs_service.grpc.pb.h" #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h" #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep diff --git a/exporters/otlp/src/otlp_grpc_metric_exporter.cc b/exporters/otlp/src/otlp_grpc_metric_exporter.cc index 6387e86f4a..f73eb1abeb 100644 --- a/exporters/otlp/src/otlp_grpc_metric_exporter.cc +++ b/exporters/otlp/src/otlp_grpc_metric_exporter.cc @@ -1,7 +1,6 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -#include #include #include #include @@ -26,6 +25,7 @@ // clang-format off #include "opentelemetry/exporters/otlp/protobuf_include_prefix.h" // IWYU pragma: keep +#include "google/protobuf/arena.h" #include "opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.h" #include "opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h" #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep diff --git a/tools/vcpkg b/tools/vcpkg index fba75d0906..4334d8b4c8 160000 --- a/tools/vcpkg +++ b/tools/vcpkg @@ -1 +1 @@ -Subproject commit fba75d09065fcc76a25dcf386b1d00d33f5175af +Subproject commit 4334d8b4c8916018600212ab4dd4bbdc343065d1