Skip to content

Commit 5983061

Browse files
dbarkerdbarker
authored
[CMAKE] Upgrade to protobuf 35.1 and grpc 1.82.1 (#4255)
1 parent c4af827 commit 5983061

7 files changed

Lines changed: 54 additions & 16 deletions

File tree

‎cmake/grpc.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ if(NOT gRPC_FOUND)
2323
"third_party/abseil-cpp"
2424
"third_party/protobuf"
2525
"third_party/cares/cares"
26-
"third_party/boringssl-with-bazel"
2726
)
2827
set(gRPC_PROVIDER "fetch_repository")
2928

@@ -38,6 +37,7 @@ if(NOT gRPC_FOUND)
3837
set(gRPC_BUILD_GRPC_PYTHON_PLUGIN OFF CACHE BOOL "" FORCE)
3938
set(gRPC_BUILD_GRPC_RUBY_PLUGIN OFF CACHE BOOL "" FORCE)
4039
set(gRPC_BUILD_GRPCPP_OTEL_PLUGIN OFF CACHE BOOL "" FORCE)
40+
set(gRPC_SSL_PROVIDER "package" CACHE STRING "" FORCE)
4141
set(gRPC_ZLIB_PROVIDER "package" CACHE STRING "" FORCE)
4242
set(gRPC_RE2_PROVIDER "module" CACHE STRING "" FORCE)
4343
set(RE2_BUILD_TESTING OFF CACHE BOOL "" FORCE)

‎exporters/otlp/test/otlp_http_exporter_test.cc‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,9 +423,14 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
423423
[&mock_session, report_trace_id, &received_trace_id_counter](
424424
const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
425425
opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request_body;
426-
request_body.ParseFromArray(
426+
const bool parsed = request_body.ParseFromArray(
427427
&mock_session->GetRequest()->body_[0],
428428
static_cast<int>(mock_session->GetRequest()->body_.size()));
429+
EXPECT_TRUE(parsed);
430+
if (!parsed)
431+
{
432+
return;
433+
}
429434
if (request_body.resource_spans_size() == 0 ||
430435
request_body.resource_spans(0).scope_spans_size() == 0 ||
431436
request_body.resource_spans(0).scope_spans(0).spans_size() == 0)
@@ -520,9 +525,14 @@ class OtlpHttpExporterTestPeer : public ::testing::Test
520525
[&mock_session, report_trace_id, &received_trace_id_counter](
521526
const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
522527
opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest request_body;
523-
request_body.ParseFromArray(
528+
const bool parsed = request_body.ParseFromArray(
524529
&mock_session->GetRequest()->body_[0],
525530
static_cast<int>(mock_session->GetRequest()->body_.size()));
531+
EXPECT_TRUE(parsed);
532+
if (!parsed)
533+
{
534+
return;
535+
}
526536
if (request_body.resource_spans_size() == 0 ||
527537
request_body.resource_spans(0).scope_spans_size() == 0 ||
528538
request_body.resource_spans(0).scope_spans(0).spans_size() == 0)

‎exporters/otlp/test/otlp_http_log_record_exporter_test.cc‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,14 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
462462
[&mock_session, report_trace_id, report_span_id, &received_record_counter](
463463
const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
464464
opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest request_body;
465-
request_body.ParseFromArray(
465+
const bool parsed = request_body.ParseFromArray(
466466
&mock_session->GetRequest()->body_[0],
467467
static_cast<int>(mock_session->GetRequest()->body_.size()));
468+
EXPECT_TRUE(parsed);
469+
if (!parsed)
470+
{
471+
return;
472+
}
468473
if (request_body.resource_logs_size() == 0 ||
469474
request_body.resource_logs(0).scope_logs_size() == 0 ||
470475
request_body.resource_logs(0).scope_logs(0).log_records_size() == 0)
@@ -590,9 +595,14 @@ class OtlpHttpLogRecordExporterTestPeer : public ::testing::Test
590595
[&mock_session, report_trace_id, report_span_id, schema_url, &received_record_counter](
591596
const std::shared_ptr<opentelemetry::ext::http::client::EventHandler> &callback) {
592597
opentelemetry::proto::collector::logs::v1::ExportLogsServiceRequest request_body;
593-
request_body.ParseFromArray(
598+
const bool parsed = request_body.ParseFromArray(
594599
&mock_session->GetRequest()->body_[0],
595600
static_cast<int>(mock_session->GetRequest()->body_.size()));
601+
EXPECT_TRUE(parsed);
602+
if (!parsed)
603+
{
604+
return;
605+
}
596606
if (request_body.resource_logs_size() == 0 ||
597607
request_body.resource_logs(0).scope_logs_size() == 0 ||
598608
request_body.resource_logs(0).scope_logs(0).log_records_size() == 0)

‎exporters/otlp/test/otlp_http_metric_exporter_test.cc‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,14 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
301301
const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
302302
&callback) {
303303
opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest request_body;
304-
request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
305-
static_cast<int>(mock_session->GetRequest()->body_.size()));
304+
const bool parsed = request_body.ParseFromArray(
305+
&mock_session->GetRequest()->body_[0],
306+
static_cast<int>(mock_session->GetRequest()->body_.size()));
307+
EXPECT_TRUE(parsed);
308+
if (!parsed)
309+
{
310+
return;
311+
}
306312
if (request_body.resource_metrics_size() == 0 ||
307313
request_body.resource_metrics(0).scope_metrics_size() == 0 ||
308314
request_body.resource_metrics(0).scope_metrics(0).metrics_size() == 0)
@@ -522,8 +528,14 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
522528
const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
523529
&callback) {
524530
opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest request_body;
525-
request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
526-
static_cast<int>(mock_session->GetRequest()->body_.size()));
531+
const bool parsed = request_body.ParseFromArray(
532+
&mock_session->GetRequest()->body_[0],
533+
static_cast<int>(mock_session->GetRequest()->body_.size()));
534+
EXPECT_TRUE(parsed);
535+
if (!parsed)
536+
{
537+
return;
538+
}
527539
if (request_body.resource_metrics_size() == 0 ||
528540
request_body.resource_metrics(0).scope_metrics_size() == 0 ||
529541
request_body.resource_metrics(0).scope_metrics(0).metrics_size() == 0)
@@ -788,8 +800,14 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
788800
const std::shared_ptr<opentelemetry::ext::http::client::EventHandler>
789801
&callback) {
790802
opentelemetry::proto::collector::metrics::v1::ExportMetricsServiceRequest request_body;
791-
request_body.ParseFromArray(&mock_session->GetRequest()->body_[0],
792-
static_cast<int>(mock_session->GetRequest()->body_.size()));
803+
const bool parsed = request_body.ParseFromArray(
804+
&mock_session->GetRequest()->body_[0],
805+
static_cast<int>(mock_session->GetRequest()->body_.size()));
806+
EXPECT_TRUE(parsed);
807+
if (!parsed)
808+
{
809+
return;
810+
}
793811
if (request_body.resource_metrics_size() == 0 ||
794812
request_body.resource_metrics(0).scope_metrics_size() == 0 ||
795813
request_body.resource_metrics(0).scope_metrics(0).metrics_size() == 0)

‎install/cmake/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ if(grpc IN_LIST _THIRDPARTY_PACKAGE_LIST)
223223
GIT_TAG ${grpc_GIT_TAG}
224224
GIT_SHALLOW ON
225225
GIT_SUBMODULES "third_party/re2" "third_party/cares/cares"
226-
"third_party/boringssl-with-bazel"
227226
PREFIX ${CMAKE_BINARY_DIR}/external/grpc
228227
INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
229228
CMAKE_ARGS "${CMAKE_OPTIONS}"
@@ -238,6 +237,7 @@ if(grpc IN_LIST _THIRDPARTY_PACKAGE_LIST)
238237
"-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF"
239238
"-DgRPC_BUILD_GRPCPP_OTEL_PLUGIN=OFF"
240239
"-DRE2_BUILD_TESTING=OFF"
240+
"-DgRPC_SSL_PROVIDER=package"
241241
"-DgRPC_ZLIB_PROVIDER=package"
242242
"-DgRPC_PROTOBUF_PROVIDER=package"
243243
"-DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG"

‎install/cmake/third_party_latest‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
abseil=20250512.1
88
zlib=v1.3.2
99
curl=curl-8_21_0
10-
protobuf=v33.6
11-
grpc=v1.81.1
10+
protobuf=v35.1
11+
grpc=v1.82.1
1212
benchmark=v1.9.4
1313
googletest=v1.17.0
1414
ms-gsl=v4.2.1

‎third_party_release‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
abseil=20250512.1
1717
zlib=v1.3.2
1818
curl=curl-8_21_0
19-
protobuf=v33.6
20-
grpc=v1.81.1
19+
protobuf=v35.1
20+
grpc=v1.82.1
2121
benchmark=v1.9.4
2222
googletest=v1.17.0
2323
ms-gsl=v4.2.1

0 commit comments

Comments
 (0)