mirror of https://github.com/grpc/grpc.git
[ruby] Update google-protobuf dep to allow 3.x and 4.x versions (#36982)
As title
`_pb.rb` protos regenerated using `grpc-tools` 1.64, which has a more recent `protoc`. (otherwise tests fail b/c we can't load the older generated code with google-protobuf 4.x - also see https://github.com/grpc/grpc/pull/36900#issuecomment-2163871696
cc @dazuma @alto-ruby
Closes #36982
COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36982 from apolcyn:update_dep 84de585b42
PiperOrigin-RevId: 645189362
pull/36946/head
apolcyn
5 months ago
committed by
Copybara-Service
parent
b18636ef21
commit
e1530b1c88
24 changed files with 61 additions and 368 deletions
@ -1,28 +1,19 @@ |
||||
# frozen_string_literal: true |
||||
# Generated by the protocol buffer compiler. DO NOT EDIT! |
||||
# source: src/proto/grpc/testing/metrics.proto |
||||
# source: grpc/testing/metrics.proto |
||||
|
||||
require 'google/protobuf' |
||||
|
||||
Google::Protobuf::DescriptorPool.generated_pool.build do |
||||
add_message "grpc.testing.GaugeResponse" do |
||||
optional :name, :string, 1 |
||||
oneof :value do |
||||
optional :long_value, :int64, 2 |
||||
optional :double_value, :double, 3 |
||||
optional :string_value, :string, 4 |
||||
end |
||||
end |
||||
add_message "grpc.testing.GaugeRequest" do |
||||
optional :name, :string, 1 |
||||
end |
||||
add_message "grpc.testing.EmptyMessage" do |
||||
end |
||||
end |
||||
|
||||
descriptor_data = "\n\x1agrpc/testing/metrics.proto\x12\x0cgrpc.testing\"l\n\rGaugeResponse\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x14\n\nlong_value\x18\x02 \x01(\x03H\x00\x12\x16\n\x0c\x64ouble_value\x18\x03 \x01(\x01H\x00\x12\x16\n\x0cstring_value\x18\x04 \x01(\tH\x00\x42\x07\n\x05value\"\x1c\n\x0cGaugeRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x0e\n\x0c\x45mptyMessage2\xa0\x01\n\x0eMetricsService\x12I\n\x0cGetAllGauges\x12\x1a.grpc.testing.EmptyMessage\x1a\x1b.grpc.testing.GaugeResponse0\x01\x12\x43\n\x08GetGauge\x12\x1a.grpc.testing.GaugeRequest\x1a\x1b.grpc.testing.GaugeResponseb\x06proto3" |
||||
|
||||
pool = Google::Protobuf::DescriptorPool.generated_pool |
||||
pool.add_serialized_file(descriptor_data) |
||||
|
||||
module Grpc |
||||
module Testing |
||||
GaugeResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.GaugeResponse").msgclass |
||||
GaugeRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.GaugeRequest").msgclass |
||||
EmptyMessage = Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.EmptyMessage").msgclass |
||||
GaugeResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.GaugeResponse").msgclass |
||||
GaugeRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.GaugeRequest").msgclass |
||||
EmptyMessage = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.EmptyMessage").msgclass |
||||
end |
||||
end |
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,35 +0,0 @@ |
||||
# Generated by the protocol buffer compiler. DO NOT EDIT! |
||||
# source: src/proto/grpc/core/stats.proto |
||||
|
||||
require 'google/protobuf' |
||||
|
||||
Google::Protobuf::DescriptorPool.generated_pool.build do |
||||
add_file("src/proto/grpc/core/stats.proto", :syntax => :proto3) do |
||||
add_message "grpc.core.Bucket" do |
||||
optional :start, :double, 1 |
||||
optional :count, :uint64, 2 |
||||
end |
||||
add_message "grpc.core.Histogram" do |
||||
repeated :buckets, :message, 1, "grpc.core.Bucket" |
||||
end |
||||
add_message "grpc.core.Metric" do |
||||
optional :name, :string, 1 |
||||
oneof :value do |
||||
optional :count, :uint64, 10 |
||||
optional :histogram, :message, 11, "grpc.core.Histogram" |
||||
end |
||||
end |
||||
add_message "grpc.core.Stats" do |
||||
repeated :metrics, :message, 1, "grpc.core.Metric" |
||||
end |
||||
end |
||||
end |
||||
|
||||
module Grpc |
||||
module Core |
||||
Bucket = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.core.Bucket").msgclass |
||||
Histogram = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.core.Histogram").msgclass |
||||
Metric = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.core.Metric").msgclass |
||||
Stats = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.core.Stats").msgclass |
||||
end |
||||
end |
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in new issue