Skip to content

[CI] Upgrade tools/vcpkg to 2025.09.17 #3701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 18, 2025
Merged

[CI] Upgrade tools/vcpkg to 2025.09.17 #3701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
69693a0
Upgrade tool/vcpkg to 2025.09.17
marcalff Oct 17, 2025
3f64365
cppcheck must ignore tools/vcpkg
marcalff Oct 17, 2025
39330b7
Changelog
marcalff Oct 17, 2025
8f4bfe0
typo
marcalff Oct 17, 2025
485d5c4
Silence warning in protobuf/arena.h
marcalff Oct 17, 2025
4102cd2
Fix iwyu
marcalff Oct 17, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/cppcheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jobs:
-i build \
-i test \
-i third_party \
-i tools \
-j $(nproc) \
. 2>&1 | tee --append cppcheck.log
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion exporters/otlp/src/otlp_grpc_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@

// 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"
#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep
// clang-format on

#ifdef ENABLE_ASYNC_EXPORT
# include <google/protobuf/arena.h>
# include <algorithm>
# include <condition_variable>
# include <cstdio>
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/src/otlp_grpc_exporter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

#include <google/protobuf/arena.h>
#include <grpcpp/client_context.h>
#include <grpcpp/support/status.h>
#include <atomic>
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/src/otlp_grpc_log_record_exporter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

#include <google/protobuf/arena.h>
#include <grpcpp/client_context.h>
#include <grpcpp/support/status.h>
#include <atomic>
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/src/otlp_grpc_metric_exporter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

#include <google/protobuf/arena.h>
#include <grpcpp/client_context.h>
#include <grpcpp/support/status.h>
#include <atomic>
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/vcpkg
Open in desktop
Submodule vcpkg updated 8837 files
Loading