From fd20a5c99ce2aa6cd3caa609048d43629d6b9d02 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 4 Nov 2024 02:51:48 +0900 Subject: [PATCH] (#25680) grpc: add version 1.67.1 * grpc: add version 1.67.0 * support ptel_plugin * update 1.67.1 --- recipes/grpc/all/conandata.yml | 3 + recipes/grpc/all/conanfile.py | 15 +- recipes/grpc/all/target_info/grpc_1.65.0.yml | 2 + recipes/grpc/all/target_info/grpc_1.67.1.yml | 187 +++++++++++++++++++ recipes/grpc/config.yml | 2 + 5 files changed, 207 insertions(+), 2 deletions(-) create mode 100644 recipes/grpc/all/target_info/grpc_1.67.1.yml diff --git a/recipes/grpc/all/conandata.yml b/recipes/grpc/all/conandata.yml index bf4e54a525f42..bffed171ed04e 100644 --- a/recipes/grpc/all/conandata.yml +++ b/recipes/grpc/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.67.1": + url: "https://github.com/grpc/grpc/archive/v1.67.1.tar.gz" + sha256: "d74f8e99a433982a12d7899f6773e285c9824e1d9a173ea1d1fb26c9bd089299" "1.65.0": url: "https://github.com/grpc/grpc/archive/v1.65.0.tar.gz" sha256: "ebc3acfde70cfae3f4f04b8dbb72259540cb1dc427be362569fbc2607dabfe39" diff --git a/recipes/grpc/all/conanfile.py b/recipes/grpc/all/conanfile.py index 846221d92beaf..0369581dce144 100644 --- a/recipes/grpc/all/conanfile.py +++ b/recipes/grpc/all/conanfile.py @@ -37,6 +37,7 @@ class GrpcConan(ConanFile): "php_plugin": [True, False], "python_plugin": [True, False], "ruby_plugin": [True, False], + "otel_plugin": [True, False], "secure": [True, False], "with_libsystemd": [True, False] } @@ -52,6 +53,7 @@ class GrpcConan(ConanFile): "php_plugin": True, "python_plugin": True, "ruby_plugin": True, + "otel_plugin": False, "secure": False, "with_libsystemd": True } @@ -88,6 +90,8 @@ def config_options(self): del self.options.fPIC if not self._supports_libsystemd: del self.options.with_libsystemd + if Version(self.version) < "1.65.0": + del self.options.otel_plugin def configure(self): if self.options.shared: @@ -115,7 +119,12 @@ def requirements(self): self.requires("re2/20230301") self.requires("zlib/[>=1.2.11 <2]") if self.options.get_safe("with_libsystemd"): - self.requires("libsystemd/255") + if Version(self.version) >= "1.67.0": + self.requires("libsystemd/255.10") + else: + self.requires("libsystemd/255") + if self.options.get_safe("otel_plugin"): + self.requires("opentelemetry-cpp/1.14.2") def package_id(self): del self.info.options.secure @@ -178,6 +187,7 @@ def generate(self): tc.cache_variables["gRPC_SSL_PROVIDER"] = "package" tc.cache_variables["gRPC_PROTOBUF_PROVIDER"] = "package" tc.cache_variables["gRPC_ABSL_PROVIDER"] = "package" + tc.cache_variables["gRPC_OPENTELEMETRY_PROVIDER"] = "package" tc.cache_variables["gRPC_BUILD_GRPC_CPP_PLUGIN"] = self.options.cpp_plugin tc.cache_variables["gRPC_BUILD_GRPC_CSHARP_PLUGIN"] = self.options.csharp_plugin @@ -186,6 +196,7 @@ def generate(self): tc.cache_variables["gRPC_BUILD_GRPC_PHP_PLUGIN"] = self.options.php_plugin tc.cache_variables["gRPC_BUILD_GRPC_PYTHON_PLUGIN"] = self.options.python_plugin tc.cache_variables["gRPC_BUILD_GRPC_RUBY_PLUGIN"] = self.options.ruby_plugin + tc.cache_variables["gRPC_BUILD_GRPCPP_OTEL_PLUGIN"] = self.options.get_safe("otel_plugin", False) # Consumed targets (abseil) via interface target_compiler_feature can propagate newer standards if not valid_min_cppstd(self, self._cxxstd_required): @@ -197,7 +208,7 @@ def generate(self): if self._supports_libsystemd: tc.cache_variables["gRPC_USE_SYSTEMD"] = self.options.with_libsystemd - + if Version(self.version) >= "1.62.0": tc.cache_variables["gRPC_DOWNLOAD_ARCHIVES"] = False diff --git a/recipes/grpc/all/target_info/grpc_1.65.0.yml b/recipes/grpc/all/target_info/grpc_1.65.0.yml index 43591e8d36116..14d6c7bc379f9 100644 --- a/recipes/grpc/all/target_info/grpc_1.65.0.yml +++ b/recipes/grpc/all/target_info/grpc_1.65.0.yml @@ -172,3 +172,5 @@ grpc_plugins: executable: "grpc_python_plugin" - target: "gRPC::grpc_ruby_plugin" executable: "grpc_ruby_plugin" + - target: "gRPC::grpc_otel_plugin" + executable: "grpc_otel_plugin" diff --git a/recipes/grpc/all/target_info/grpc_1.67.1.yml b/recipes/grpc/all/target_info/grpc_1.67.1.yml new file mode 100644 index 0000000000000..9d25e03682db2 --- /dev/null +++ b/recipes/grpc/all/target_info/grpc_1.67.1.yml @@ -0,0 +1,187 @@ +grpc_version: 1.67.0 +grpc_targets: + - name: "address_sorting" + lib: "address_sorting" + - name: "gpr" + lib: "gpr" + requires: + - abseil::absl_base + - abseil::absl_core_headers + - abseil::absl_log_severity + - abseil::absl_flags + - abseil::absl_flags_marshalling + - abseil::absl_any_invocable + - abseil::absl_check + - abseil::absl_log_globals + - abseil::absl_log + - abseil::absl_memory + - abseil::absl_random_random + - abseil::absl_status + - abseil::absl_cord + - abseil::absl_str_format + - abseil::absl_strings + - abseil::absl_synchronization + - abseil::absl_time + - abseil::absl_optional + - abseil::absl_variant + - name: "_grpc" + lib: "grpc" + requires: + - upb_json_lib + - upb_textformat_lib + - re2::re2 + - zlib::zlib + - abseil::absl_algorithm_container + - abseil::absl_config + - abseil::absl_no_destructor + - abseil::absl_cleanup + - abseil::absl_flat_hash_map + - abseil::absl_flat_hash_set + - abseil::absl_inlined_vector + - abseil::absl_bind_front + - abseil::absl_function_ref + - abseil::absl_hash + - abseil::absl_type_traits + - abseil::absl_random_bit_gen_ref + - abseil::absl_random_distributions + - abseil::absl_statusor + - abseil::absl_span + - abseil::absl_utility + - c-ares::cares + - gpr + - openssl::ssl + - openssl::crypto + - address_sorting + frameworks: ['CoreFoundation'] + - name: "grpc_unsecure" + lib: "grpc_unsecure" + requires: + - upb_mini_descriptor_lib + - upb_wire_lib + - zlib::zlib + - abseil::absl_algorithm_container + - abseil::absl_config + - abseil::absl_no_destructor + - abseil::absl_cleanup + - abseil::absl_flat_hash_map + - abseil::absl_flat_hash_set + - abseil::absl_inlined_vector + - abseil::absl_bind_front + - abseil::absl_function_ref + - abseil::absl_hash + - abseil::absl_type_traits + - abseil::absl_random_bit_gen_ref + - abseil::absl_random_distributions + - abseil::absl_statusor + - abseil::absl_span + - abseil::absl_utility + - c-ares::cares + - gpr + - address_sorting + frameworks: ['CoreFoundation'] + - name: "upb_base_lib" + lib: "upb_base_lib" + - name: "upb_mini_descriptor_lib" + lib: "upb_mini_descriptor_lib" + requires: + - upb_base_lib + - upb_mem_lib + - name: "upb_wire_lib" + lib: "upb_wire_lib" + requires: + - utf8_range_lib + - upb_message_lib + - name: "upb_json_lib" + lib: "upb_json_lib" + requires: + - upb_mini_descriptor_lib + - upb_wire_lib + - name: "upb_mem_lib" + lib: "upb_mem_lib" + - name: "upb_message_lib" + lib: "upb_message_lib" + requires: + - upb_base_lib + - upb_mem_lib + - name: "upb_textformat_lib" + lib: "upb_textformat_lib" + requires: + - upb_mini_descriptor_lib + - upb_wire_lib + - name: "utf8_range_lib" + lib: "utf8_range_lib" + - name: "grpc++" + lib: "grpc++" + requires: + - abseil::absl_absl_check + - abseil::absl_absl_log + - _grpc + - protobuf::libprotobuf + - name: "grpc++_alts" + lib: "grpc++_alts" + requires: + - grpc++ + - name: "grpc++_error_details" + lib: "grpc++_error_details" + requires: + - grpc++ + - name: "grpc++_reflection" + lib: "grpc++_reflection" + requires: + - grpc++ + - name: "grpc++_unsecure" + lib: "grpc++_unsecure" + requires: + - abseil::absl_absl_check + - abseil::absl_absl_log + - grpc_unsecure + - protobuf::libprotobuf + - name: "grpc_authorization_provider" + lib: "grpc_authorization_provider" + requires: + - upb_mini_descriptor_lib + - upb_wire_lib + - upb_message_lib + - re2::re2 + - zlib::zlib + - abseil::absl_config + - abseil::absl_no_destructor + - abseil::absl_cleanup + - abseil::absl_flat_hash_map + - abseil::absl_flat_hash_set + - abseil::absl_inlined_vector + - abseil::absl_function_ref + - abseil::absl_hash + - abseil::absl_type_traits + - abseil::absl_statusor + - abseil::absl_span + - abseil::absl_utility + - c-ares::cares + - gpr + - address_sorting + - name: "grpc_plugin_support" + lib: "grpc_plugin_support" + requires: + - protobuf::libprotobuf + - protobuf::libprotoc + - name: "grpcpp_channelz" + lib: "grpcpp_channelz" + requires: + - grpc++ +grpc_plugins: + - target: "gRPC::grpc_cpp_plugin" + executable: "grpc_cpp_plugin" + - target: "gRPC::grpc_csharp_plugin" + executable: "grpc_csharp_plugin" + - target: "gRPC::grpc_node_plugin" + executable: "grpc_node_plugin" + - target: "gRPC::grpc_objective_c_plugin" + executable: "grpc_objective_c_plugin" + - target: "gRPC::grpc_php_plugin" + executable: "grpc_php_plugin" + - target: "gRPC::grpc_python_plugin" + executable: "grpc_python_plugin" + - target: "gRPC::grpc_ruby_plugin" + executable: "grpc_ruby_plugin" + - target: "gRPC::grpc_otel_plugin" + executable: "grpc_otel_plugin" diff --git a/recipes/grpc/config.yml b/recipes/grpc/config.yml index eac63c2367c27..cbfb6a6cea659 100644 --- a/recipes/grpc/config.yml +++ b/recipes/grpc/config.yml @@ -1,4 +1,6 @@ versions: + "1.67.1": + folder: "all" "1.65.0": folder: "all" "1.54.3":