diff --git a/cmake/Abseil.cmake b/cmake/Abseil.cmake index 64f76404e0..cfa4a8b1bb 100644 --- a/cmake/Abseil.cmake +++ b/cmake/Abseil.cmake @@ -28,8 +28,8 @@ set(PC ${Bash_EXECUTABLE} -c "set -x &&\ FetchContent_Declare( absl - URL https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.0.tar.gz - URL_HASH SHA256=59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5 + URL https://github.com/abseil/abseil-cpp/archive/refs/tags/20240722.0.tar.gz + URL_HASH SHA256=f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3 PATCH_COMMAND "${PC}" OVERRIDE_FIND_PACKAGE ) diff --git a/cmake/Grpc.cmake b/cmake/Grpc.cmake index 7c881bae7e..ae578c8ee3 100644 --- a/cmake/Grpc.cmake +++ b/cmake/Grpc.cmake @@ -29,11 +29,18 @@ set(gRPC_SSL_PROVIDER "package" CACHE STRING "" FORCE) set(protobuf_BUILD_TESTS OFF CACHE BOOL "" FORCE) set(protobuf_ABSL_PROVIDER "package" CACHE STRING "" FORCE) +set(PATCH_FILE_1 "${CMAKE_SOURCE_DIR}/thirdparty/grpc/remove-custom-commands-for-unused-dependencies.patch") +set(PATCH_FILE_2 "${CMAKE_SOURCE_DIR}/thirdparty/grpc/fix-constants-on-windows.patch") +set(PC ${Bash_EXECUTABLE} -c "set -x &&\ + (\\\"${Patch_EXECUTABLE}\\\" -p1 -R -s -f --dry-run -i \\\"${PATCH_FILE_1}\\\" || \\\"${Patch_EXECUTABLE}\\\" -p1 -N -i \\\"${PATCH_FILE_1}\\\") &&\ + (\\\"${Patch_EXECUTABLE}\\\" -p1 -R -s -f --dry-run -i \\\"${PATCH_FILE_2}\\\" || \\\"${Patch_EXECUTABLE}\\\" -p1 -N -i \\\"${PATCH_FILE_2}\\\")") + FetchContent_Declare( grpc GIT_REPOSITORY https://github.com/grpc/grpc - GIT_TAG v1.59.2 - GIT_SUBMODULES "third_party/cares/cares third_party/protobuf third_party/re2" + GIT_TAG v1.68.0 + GIT_SUBMODULES "third_party/cares/cares third_party/protobuf third_party/re2 third_party/upb" + PATCH_COMMAND "${PC}" ) set(FETCHCONTENT_QUIET OFF) FetchContent_MakeAvailable(grpc) diff --git a/docker/test/integration/cluster/checkers/GrafanaLokiChecker.py b/docker/test/integration/cluster/checkers/GrafanaLokiChecker.py index 764f20d3db..da78f2a205 100644 --- a/docker/test/integration/cluster/checkers/GrafanaLokiChecker.py +++ b/docker/test/integration/cluster/checkers/GrafanaLokiChecker.py @@ -19,7 +19,7 @@ class GrafanaLokiChecker: def __init__(self): - self.url = "localhost:3100/loki/api/v1/query" + self.url = "localhost:3100/loki/api/v1/query_range" def veify_log_lines_on_grafana_loki(self, lines: List[str], ssl: bool, tenant_id: str): labels = '{job="minifi"}' diff --git a/docker/test/integration/cluster/containers/GrafanaLokiContainer.py b/docker/test/integration/cluster/containers/GrafanaLokiContainer.py index 767acbe569..a46cd2dbff 100644 --- a/docker/test/integration/cluster/containers/GrafanaLokiContainer.py +++ b/docker/test/integration/cluster/containers/GrafanaLokiContainer.py @@ -114,10 +114,10 @@ def __init__(self, feature_context, name, vols, network, image_store, options: G schema_config: configs: - - from: 2020-10-24 - store: boltdb-shipper + - from: 2020-05-15 + store: tsdb object_store: filesystem - schema: v11 + schema: v13 index: prefix: index_ period: 24h @@ -167,7 +167,7 @@ def deploy(self): )) self.client.containers.run( - image="grafana/loki:2.9.2", + image="grafana/loki:3.2.1", detach=True, name=self.name, network=self.network.name, diff --git a/docker/test/integration/features/grafana_loki.feature b/docker/test/integration/features/grafana_loki.feature index 0904edbf65..3ef91c4480 100644 --- a/docker/test/integration/features/grafana_loki.feature +++ b/docker/test/integration/features/grafana_loki.feature @@ -68,7 +68,7 @@ Feature: MiNiFi can publish logs to Grafana Loki server Given a Grafana Loki server is set up And a TailFile processor with the "File to Tail" property set to "/tmp/input/test_file.log" And a file with filename "test_file.log" and content "log line 1\nlog line 2\nlog line 3\n" is present in "/tmp/input" - And a PushGrafanaLokiGrpc processor with the "Url" property set to "grafana-loki-server-${feature_id}:9095/" + And a PushGrafanaLokiGrpc processor with the "Url" property set to "grafana-loki-server-${feature_id}:9095" And the "Stream Labels" property of the PushGrafanaLokiGrpc processor is set to "job=minifi,id=docker-test" And the "success" relationship of the TailFile processor is connected to the PushGrafanaLokiGrpc When all instances start up @@ -78,7 +78,7 @@ Feature: MiNiFi can publish logs to Grafana Loki server Given a Grafana Loki server is set up with multi-tenancy enabled And a TailFile processor with the "File to Tail" property set to "/tmp/input/test_file.log" And a file with filename "test_file.log" and content "log line 1\nlog line 2\nlog line 3\n" is present in "/tmp/input" - And a PushGrafanaLokiGrpc processor with the "Url" property set to "grafana-loki-server-${feature_id}:9095/" + And a PushGrafanaLokiGrpc processor with the "Url" property set to "grafana-loki-server-${feature_id}:9095" And the "Stream Labels" property of the PushGrafanaLokiGrpc processor is set to "job=minifi,id=docker-test" And the "Tenant ID" property of the PushGrafanaLokiGrpc processor is set to "mytenant" And the "success" relationship of the TailFile processor is connected to the PushGrafanaLokiGrpc @@ -89,7 +89,7 @@ Feature: MiNiFi can publish logs to Grafana Loki server Given a Grafana Loki server with SSL is set up And a TailFile processor with the "File to Tail" property set to "/tmp/input/test_file.log" And a file with filename "test_file.log" and content "log line 1\nlog line 2\nlog line 3\n" is present in "/tmp/input" - And a PushGrafanaLokiGrpc processor with the "Url" property set to "grafana-loki-server-${feature_id}:9095/" + And a PushGrafanaLokiGrpc processor with the "Url" property set to "grafana-loki-server-${feature_id}:9095" And the "Stream Labels" property of the PushGrafanaLokiGrpc processor is set to "job=minifi,id=docker-test" And the "success" relationship of the TailFile processor is connected to the PushGrafanaLokiGrpc And a SSL context service is set up for Grafana Loki processor "PushGrafanaLokiGrpc" diff --git a/extensions/grafana-loki/PushGrafanaLokiGrpc.cpp b/extensions/grafana-loki/PushGrafanaLokiGrpc.cpp index a2c7b2ec3e..4fe88202c3 100644 --- a/extensions/grafana-loki/PushGrafanaLokiGrpc.cpp +++ b/extensions/grafana-loki/PushGrafanaLokiGrpc.cpp @@ -133,7 +133,7 @@ nonstd::expected PushGrafanaLokiGrpc::submitRequest(const std } if (!push_channel_->WaitForConnected(std::chrono::system_clock::now() + connection_timeout_ms_)) { - return nonstd::make_unexpected("Timeout waiting for connection to Grafana Loki gRPC server"); + return nonstd::make_unexpected("Timeout waiting for connection to Grafana Loki gRPC server. Please check if the server is running and reachable and the Url value is correct."); } logproto::PushResponse response; diff --git a/extensions/standard-processors/tests/unit/RollingWindowTests.cpp b/extensions/standard-processors/tests/unit/RollingWindowTests.cpp index b17b4a89bf..e670d4e7da 100644 --- a/extensions/standard-processors/tests/unit/RollingWindowTests.cpp +++ b/extensions/standard-processors/tests/unit/RollingWindowTests.cpp @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +#include #include #include "unit/Catch.h" #include "RollingWindow.h" diff --git a/thirdparty/abseil/rename-crc32.patch b/thirdparty/abseil/rename-crc32.patch index 45b845bf49..026a430040 100644 --- a/thirdparty/abseil/rename-crc32.patch +++ b/thirdparty/abseil/rename-crc32.patch @@ -1,8 +1,8 @@ diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake -index f0d984ae..6e6dc40b 100644 +index 32cc28fb..8e9dc702 100644 --- a/CMake/AbseilDll.cmake +++ b/CMake/AbseilDll.cmake -@@ -474,7 +474,7 @@ set(ABSL_INTERNAL_DLL_TARGETS +@@ -521,7 +521,7 @@ set(ABSL_INTERNAL_DLL_TARGETS "crc_cord_state" "crc_cpu_detect" "crc_internal" @@ -12,10 +12,10 @@ index f0d984ae..6e6dc40b 100644 "debugging_internal" "demangle_internal" diff --git a/absl/crc/BUILD.bazel b/absl/crc/BUILD.bazel -index cdbaa9b2..78dac82e 100644 +index 890d637c..8d680c22 100644 --- a/absl/crc/BUILD.bazel +++ b/absl/crc/BUILD.bazel -@@ -67,7 +67,7 @@ cc_library( +@@ -72,7 +72,7 @@ cc_library( ) cc_library( @@ -25,10 +25,10 @@ index cdbaa9b2..78dac82e 100644 "crc32c.cc", "internal/crc32c_inline.h", diff --git a/absl/crc/CMakeLists.txt b/absl/crc/CMakeLists.txt -index 21247160..f72b6cb3 100644 +index d52a1bc4..3cec9dcb 100644 --- a/absl/crc/CMakeLists.txt +++ b/absl/crc/CMakeLists.txt -@@ -55,7 +55,7 @@ absl_cc_library( +@@ -53,7 +53,7 @@ absl_cc_library( absl_cc_library( NAME @@ -37,7 +37,7 @@ index 21247160..f72b6cb3 100644 HDRS "crc32c.h" "internal/crc32c.h" -@@ -89,7 +89,7 @@ absl_cc_test( +@@ -86,7 +86,7 @@ absl_cc_test( COPTS ${ABSL_DEFAULT_COPTS} DEPS @@ -46,7 +46,7 @@ index 21247160..f72b6cb3 100644 absl::strings absl::str_format GTest::gtest_main -@@ -129,7 +129,7 @@ absl_cc_test( +@@ -126,7 +126,7 @@ absl_cc_test( COPTS ${ABSL_DEFAULT_COPTS} DEPS @@ -55,7 +55,7 @@ index 21247160..f72b6cb3 100644 absl::memory absl::random_random absl::random_distributions -@@ -159,7 +159,7 @@ absl_cc_library( +@@ -156,7 +156,7 @@ absl_cc_library( COPTS ${ABSL_DEFAULT_COPTS} DEPS @@ -63,8 +63,8 @@ index 21247160..f72b6cb3 100644 + absl::crc32c_internal absl::config absl::strings - ) -@@ -173,6 +173,6 @@ absl_cc_test( + absl::no_destructor +@@ -171,6 +171,6 @@ absl_cc_test( ${ABSL_DEFAULT_COPTS} DEPS absl::crc_cord_state @@ -72,3 +72,16 @@ index 21247160..f72b6cb3 100644 + absl::crc32c_internal GTest::gtest_main ) +diff --git a/absl/strings/CMakeLists.txt b/absl/strings/CMakeLists.txt +index 3a1619e8..2c368cf2 100644 +--- a/absl/strings/CMakeLists.txt ++++ b/absl/strings/CMakeLists.txt +@@ -987,7 +987,7 @@ absl_cc_library( + absl::cordz_update_scope + absl::cordz_update_tracker + absl::core_headers +- absl::crc32c ++ absl::crc32c_internal + absl::crc_cord_state + absl::endian + absl::function_ref diff --git a/thirdparty/grpc/fix-constants-on-windows.patch b/thirdparty/grpc/fix-constants-on-windows.patch new file mode 100644 index 0000000000..90e087396e --- /dev/null +++ b/thirdparty/grpc/fix-constants-on-windows.patch @@ -0,0 +1,35 @@ +diff --git a/third_party/protobuf/upb/message/internal/message.c b/third_party/protobuf/upb/message/internal/message.c +index 57ab2d737..5f321c7bb 100644 +--- a/third_party/protobuf/upb/message/internal/message.c ++++ b/third_party/protobuf/upb/message/internal/message.c +@@ -17,9 +17,9 @@ + // Must be last. + #include "upb/port/def.inc" + +-const float kUpb_FltInfinity = INFINITY; +-const double kUpb_Infinity = INFINITY; +-const double kUpb_NaN = NAN; ++const float kUpb_FltInfinity = (float)(1.0 / 0.0); ++const double kUpb_Infinity = 1.0 / 0.0; ++const double kUpb_NaN = 0.0 / 0.0; + + bool UPB_PRIVATE(_upb_Message_Realloc)(struct upb_Message* msg, size_t need, + upb_Arena* a) { +diff --git a/third_party/upb/upb/message/internal/message.c b/third_party/upb/upb/message/internal/message.c +index 57ab2d737..5f321c7bb 100644 +--- a/third_party/upb/upb/message/internal/message.c ++++ b/third_party/upb/upb/message/internal/message.c +@@ -17,9 +17,9 @@ + // Must be last. + #include "upb/port/def.inc" + +-const float kUpb_FltInfinity = INFINITY; +-const double kUpb_Infinity = INFINITY; +-const double kUpb_NaN = NAN; ++const float kUpb_FltInfinity = (float)(1.0 / 0.0); ++const double kUpb_Infinity = 1.0 / 0.0; ++const double kUpb_NaN = 0.0 / 0.0; + + bool UPB_PRIVATE(_upb_Message_Realloc)(struct upb_Message* msg, size_t need, + upb_Arena* a) { + diff --git a/thirdparty/grpc/remove-custom-commands-for-unused-dependencies.patch b/thirdparty/grpc/remove-custom-commands-for-unused-dependencies.patch new file mode 100644 index 0000000000..c90bd194cc --- /dev/null +++ b/thirdparty/grpc/remove-custom-commands-for-unused-dependencies.patch @@ -0,0 +1,428 @@ +Removing the line ending whitespaces are not needed for the patch, but it ensures that the reverse patch in the dry run of the +patch command fails. Otherwise the patch is not applied in the cmake configuration. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc4b6a40a5..ae494f1464 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -489,7 +489,7 @@ if(WIN32) + set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} ws2_32 crypt32) + set(_gRPC_STATIC_WIN32 STATIC) + endif() +- ++ + if(BUILD_SHARED_LIBS AND WIN32) + + # Currently for shared lib on Windows (i.e. a DLL) certain bits of source code +@@ -890,411 +890,6 @@ protobuf_generate_grpc_cpp_with_import_path_correction( + protobuf_generate_grpc_cpp_with_import_path_correction( + test/core/tsi/alts/fake_handshaker/transport_security_common.proto test/core/tsi/alts/fake_handshaker/transport_security_common.proto + ) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/annotations/deprecation.proto envoy/annotations/deprecation.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/annotations/resource.proto envoy/annotations/resource.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/accesslog/v3/accesslog.proto envoy/config/accesslog/v3/accesslog.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/cluster/v3/circuit_breaker.proto envoy/config/cluster/v3/circuit_breaker.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/cluster/v3/cluster.proto envoy/config/cluster/v3/cluster.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/cluster/v3/filter.proto envoy/config/cluster/v3/filter.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/cluster/v3/outlier_detection.proto envoy/config/cluster/v3/outlier_detection.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/address.proto envoy/config/core/v3/address.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/backoff.proto envoy/config/core/v3/backoff.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/base.proto envoy/config/core/v3/base.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/config_source.proto envoy/config/core/v3/config_source.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/event_service_config.proto envoy/config/core/v3/event_service_config.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/extension.proto envoy/config/core/v3/extension.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/grpc_method_list.proto envoy/config/core/v3/grpc_method_list.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/grpc_service.proto envoy/config/core/v3/grpc_service.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/health_check.proto envoy/config/core/v3/health_check.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/http_service.proto envoy/config/core/v3/http_service.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/http_uri.proto envoy/config/core/v3/http_uri.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/protocol.proto envoy/config/core/v3/protocol.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/proxy_protocol.proto envoy/config/core/v3/proxy_protocol.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/resolver.proto envoy/config/core/v3/resolver.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/socket_option.proto envoy/config/core/v3/socket_option.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/substitution_format_string.proto envoy/config/core/v3/substitution_format_string.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/core/v3/udp_socket_config.proto envoy/config/core/v3/udp_socket_config.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/endpoint/v3/endpoint.proto envoy/config/endpoint/v3/endpoint.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/endpoint/v3/endpoint_components.proto envoy/config/endpoint/v3/endpoint_components.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/endpoint/v3/load_report.proto envoy/config/endpoint/v3/load_report.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/listener/v3/api_listener.proto envoy/config/listener/v3/api_listener.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/listener/v3/listener.proto envoy/config/listener/v3/listener.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/listener/v3/listener_components.proto envoy/config/listener/v3/listener_components.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/listener/v3/quic_config.proto envoy/config/listener/v3/quic_config.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/listener/v3/udp_listener_config.proto envoy/config/listener/v3/udp_listener_config.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/rbac/v3/rbac.proto envoy/config/rbac/v3/rbac.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/route/v3/route.proto envoy/config/route/v3/route.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/route/v3/route_components.proto envoy/config/route/v3/route_components.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/route/v3/scoped_route.proto envoy/config/route/v3/scoped_route.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/trace/v3/datadog.proto envoy/config/trace/v3/datadog.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/trace/v3/dynamic_ot.proto envoy/config/trace/v3/dynamic_ot.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/trace/v3/http_tracer.proto envoy/config/trace/v3/http_tracer.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/trace/v3/lightstep.proto envoy/config/trace/v3/lightstep.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/trace/v3/opencensus.proto envoy/config/trace/v3/opencensus.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/trace/v3/opentelemetry.proto envoy/config/trace/v3/opentelemetry.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/trace/v3/service.proto envoy/config/trace/v3/service.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/trace/v3/skywalking.proto envoy/config/trace/v3/skywalking.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/trace/v3/trace.proto envoy/config/trace/v3/trace.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/trace/v3/xray.proto envoy/config/trace/v3/xray.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/config/trace/v3/zipkin.proto envoy/config/trace/v3/zipkin.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/data/accesslog/v3/accesslog.proto envoy/data/accesslog/v3/accesslog.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/clusters/aggregate/v3/cluster.proto envoy/extensions/clusters/aggregate/v3/cluster.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/filters/common/fault/v3/fault.proto envoy/extensions/filters/common/fault/v3/fault.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/filters/http/fault/v3/fault.proto envoy/extensions/filters/http/fault/v3/fault.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/filters/http/rbac/v3/rbac.proto envoy/extensions/filters/http/rbac/v3/rbac.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/filters/http/router/v3/router.proto envoy/extensions/filters/http/router/v3/router.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto envoy/extensions/filters/http/stateful_session/v3/stateful_session.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/http/stateful_session/cookie/v3/cookie.proto envoy/extensions/http/stateful_session/cookie/v3/cookie.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/load_balancing_policies/common/v3/common.proto envoy/extensions/load_balancing_policies/common/v3/common.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.proto envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/rbac/audit_loggers/stream/v3/stream.proto envoy/extensions/rbac/audit_loggers/stream/v3/stream.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/transport_sockets/tls/v3/cert.proto envoy/extensions/transport_sockets/tls/v3/cert.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/transport_sockets/tls/v3/common.proto envoy/extensions/transport_sockets/tls/v3/common.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/transport_sockets/tls/v3/secret.proto envoy/extensions/transport_sockets/tls/v3/secret.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/transport_sockets/tls/v3/tls.proto envoy/extensions/transport_sockets/tls/v3/tls.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/extensions/upstreams/http/v3/http_protocol_options.proto envoy/extensions/upstreams/http/v3/http_protocol_options.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/service/discovery/v3/ads.proto envoy/service/discovery/v3/ads.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/service/discovery/v3/discovery.proto envoy/service/discovery/v3/discovery.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/http/v3/cookie.proto envoy/type/http/v3/cookie.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/http/v3/path_transformation.proto envoy/type/http/v3/path_transformation.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/matcher/v3/filter_state.proto envoy/type/matcher/v3/filter_state.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/matcher/v3/http_inputs.proto envoy/type/matcher/v3/http_inputs.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/matcher/v3/metadata.proto envoy/type/matcher/v3/metadata.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/matcher/v3/node.proto envoy/type/matcher/v3/node.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/matcher/v3/number.proto envoy/type/matcher/v3/number.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/matcher/v3/path.proto envoy/type/matcher/v3/path.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/matcher/v3/regex.proto envoy/type/matcher/v3/regex.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/matcher/v3/status_code_input.proto envoy/type/matcher/v3/status_code_input.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/matcher/v3/string.proto envoy/type/matcher/v3/string.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/matcher/v3/struct.proto envoy/type/matcher/v3/struct.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/matcher/v3/value.proto envoy/type/matcher/v3/value.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/metadata/v3/metadata.proto envoy/type/metadata/v3/metadata.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/tracing/v3/custom_tag.proto envoy/type/tracing/v3/custom_tag.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/v3/hash_policy.proto envoy/type/v3/hash_policy.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/v3/http.proto envoy/type/v3/http.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/v3/http_status.proto envoy/type/v3/http_status.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/v3/percent.proto envoy/type/v3/percent.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/v3/range.proto envoy/type/v3/range.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/v3/ratelimit_strategy.proto envoy/type/v3/ratelimit_strategy.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/v3/ratelimit_unit.proto envoy/type/v3/ratelimit_unit.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/v3/semantic_version.proto envoy/type/v3/semantic_version.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/envoy-api/envoy/type/v3/token_bucket.proto envoy/type/v3/token_bucket.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/googleapis/google/api/annotations.proto google/api/annotations.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/googleapis/google/api/expr/v1alpha1/checked.proto google/api/expr/v1alpha1/checked.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/googleapis/google/api/expr/v1alpha1/syntax.proto google/api/expr/v1alpha1/syntax.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/googleapis/google/api/http.proto google/api/http.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/googleapis/google/api/httpbody.proto google/api/httpbody.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/googleapis/google/rpc/status.proto google/rpc/status.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/opencensus-proto/src/opencensus/proto/trace/v1/trace_config.proto opencensus/proto/trace/v1/trace_config.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/protoc-gen-validate/validate/validate.proto validate/validate.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/udpa/annotations/migrate.proto udpa/annotations/migrate.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/udpa/annotations/security.proto udpa/annotations/security.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/udpa/annotations/sensitive.proto udpa/annotations/sensitive.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/udpa/annotations/status.proto udpa/annotations/status.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/udpa/annotations/versioning.proto udpa/annotations/versioning.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/udpa/type/v1/typed_struct.proto udpa/type/v1/typed_struct.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/annotations/v3/migrate.proto xds/annotations/v3/migrate.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/annotations/v3/security.proto xds/annotations/v3/security.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/annotations/v3/sensitive.proto xds/annotations/v3/sensitive.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/annotations/v3/status.proto xds/annotations/v3/status.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/annotations/v3/versioning.proto xds/annotations/v3/versioning.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/core/v3/authority.proto xds/core/v3/authority.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/core/v3/cidr.proto xds/core/v3/cidr.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/core/v3/collection_entry.proto xds/core/v3/collection_entry.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/core/v3/context_params.proto xds/core/v3/context_params.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/core/v3/extension.proto xds/core/v3/extension.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/core/v3/resource.proto xds/core/v3/resource.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/core/v3/resource_locator.proto xds/core/v3/resource_locator.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/core/v3/resource_name.proto xds/core/v3/resource_name.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/type/matcher/v3/cel.proto xds/type/matcher/v3/cel.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/type/matcher/v3/domain.proto xds/type/matcher/v3/domain.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/type/matcher/v3/http_inputs.proto xds/type/matcher/v3/http_inputs.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/type/matcher/v3/ip.proto xds/type/matcher/v3/ip.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/type/matcher/v3/matcher.proto xds/type/matcher/v3/matcher.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/type/matcher/v3/range.proto xds/type/matcher/v3/range.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/type/matcher/v3/regex.proto xds/type/matcher/v3/regex.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/type/matcher/v3/string.proto xds/type/matcher/v3/string.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/type/v3/cel.proto xds/type/v3/cel.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/type/v3/range.proto xds/type/v3/range.proto +-) +-protobuf_generate_grpc_cpp_with_import_path_correction( +- third_party/xds/xds/type/v3/typed_struct.proto xds/type/v3/typed_struct.proto +-) + + if(gRPC_BUILD_TESTS) + add_custom_target(buildtests_c)