grpc_service_mesh 0.16.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241b9590dcd6bc041d6e575e74ece01d4fa165d4380c16a275b9823a05cadb94
-  data.tar.gz: a5d716495824f89fc9f3bf9eaf6ed1b163459fee48d5f8270d4a8905538ac5c5
+  metadata.gz: 21c351668cf435aee69b1af4ce158f3d6ba6c82016d97a0352bf06498507f801
+  data.tar.gz: 97ecc19ca596654545b66a38270b39d52c79b961789b45858045d1b542eebf00
 SHA512:
-  metadata.gz: 821daff5b253055c2baa16b9ebc41e38f624752ac0b21d4d01d510680327daaf7a040c8c740aa03211258d2d60a443464a0620411e146abb765f21cb1f7bffb1
-  data.tar.gz: 01417c334a7980dc1da34d37266b3caeba22d01ec95d0db793abab0f025ee548c919e4754ccddfc7597a809571e144d7ca86a0d28ef13457964cabdbe4520bec
+  metadata.gz: f77a8d39aca21eeccfcc78132dfdfdb1b3b6a886dc83124e286153135013959317ad4e5da8261a1cec5dc953131887859384c26084b4268e2129b8a8b6249b1a
+  data.tar.gz: 60e395b62bb24dbc11eb59081612bc638cbbd617279e459d5804bf3402672a52e3ab48ebdf8e7335b33a562592756020557cc8078e3f3c5131e7d3a2bd4683b2

data/README.md

@@ -1,6 +1,6 @@
 # grpc-service-mesh-ruby
 
-`grpc_service_mesh` is the Ruby implementation of the
+grpc-service-mesh-ruby is the Ruby implementation of the
 [gRPC Service Mesh API](https://github.com/Paymentbox-com/grpc-service-mesh-api).
 It carries protobuf messages over any transport that implements the
 [Service Mesh API Specification](https://github.com/Paymentbox-com/service-mesh-api)
@@ -22,13 +22,9 @@ repository and lives in a definitions project.
 
 ## Install
 
-The gem and its `service_mesh` dependency are installed from their
-repositories at a tag, so the Gemfile names both git sources.
-
 ```ruby
 # Gemfile
-gem "grpc_service_mesh", git: "https://github.com/Paymentbox-com/grpc-service-mesh-ruby", tag: "v0.15.0"
-gem "service_mesh", git: "https://github.com/Paymentbox-com/service-mesh-ruby", tag: "v0.4.2"
+gem "grpc_service_mesh"
 ```
 
 Requires Ruby 3.3 or newer. The gem depends on `service_mesh`,

data/lib/grpc_service_mesh/registry.rb

@@ -9,29 +9,46 @@ module GrpcServiceMesh
       @subscribers = []
     end
 
-    # Adds the bindings of +service+, an RPCService instance. Every binding
-    # is kept, so two registrations of one Target hand the transport two
-    # bindings for it.
-    def register(service)
-      @endpoints.concat(service.endpoints)
-      @subscribers.concat(service.subscribers)
+    # Adds the endpoints and subscribers of +service+, an RPCService
+    # instance. +consumer_groups+ maps a target of the service to the
+    # consumer group of its endpoint or subscriber, replacing the one the
+    # generated code carries. "" removes it, so the runtime's deployment group
+    # applies, and ServiceMesh::CONSUMER_GROUP_NONE means no group. Raises
+    # ArgumentError, and registers nothing, when a target is not one of the
+    # service's. Every endpoint and subscriber is kept, so two registrations of
+    # one target hand the transport two of them.
+    def register(service, consumer_groups: {})
+      endpoints = service.endpoints
+      subscribers = service.subscribers
+      consumer_groups.each do |target, group|
+        found = false
+        apply = lambda do |served|
+          next served unless served.target.same_channel?(target)
+
+          found = true
+          with_group(served, group)
+        end
+        endpoints = endpoints.map(&apply)
+        subscribers = subscribers.map(&apply)
+        raise ArgumentError, "consumer_groups names target #{target.segments.inspect}, which is not an rpc method of #{service.class}" unless found
+      end
+      @endpoints.concat(endpoints)
+      @subscribers.concat(subscribers)
       nil
     end
 
-    # Endpoints whose Target carries +deployment_group+.
-    def endpoints(deployment_group)
-      @endpoints.select { |e| in_group?(e, deployment_group) }
-    end
+    # Every registered Endpoint.
+    attr_reader :endpoints
 
-    # Subscribers whose Target carries +deployment_group+.
-    def subscribers(deployment_group)
-      @subscribers.select { |s| in_group?(s, deployment_group) }
-    end
+    # Every registered Subscriber.
+    attr_reader :subscribers
 
     private
 
-    def in_group?(binding, deployment_group)
-      binding.target.metadata[ServiceMesh::DEPLOYMENT_GROUP_KEY] == deployment_group
+    def with_group(served, group)
+      metadata = served.metadata.to_h.except(ServiceMesh::CONSUMER_GROUP_KEY)
+      metadata[ServiceMesh::CONSUMER_GROUP_KEY] = group unless group.to_s.empty?
+      served.with(metadata: metadata)
     end
   end
 end

data/lib/grpc_service_mesh/rpc.rb

@@ -2,12 +2,13 @@
 
 module GrpcServiceMesh
   # One rpc method as the generated code declares it. +owner+ is the class
-  # the declaration appeared in.
-  Rpc = Data.define(:name, :target, :input, :output, :kind, :owner) do
-    def initialize(name:, target:, input:, kind:, owner:, output: nil)
+  # the declaration appeared in. +consumer_group+ is the method's
+  # consumer_group option, or nil when it has none.
+  Rpc = Data.define(:name, :target, :input, :output, :kind, :owner, :consumer_group) do
+    def initialize(name:, target:, input:, kind:, owner:, output: nil, consumer_group: nil)
       raise ServiceMesh::KindMismatch, "rpc #{name}: declared #{kind}, target is #{target.kind}" unless kind == target.kind
 
-      super(name: name, target: target, input: input, output: output, kind: kind, owner: owner)
+      super(name: name, target: target, input: input, output: output, kind: kind, owner: owner, consumer_group: consumer_group)
     end
 
     def route? = kind == :route
@@ -17,9 +18,10 @@ module GrpcServiceMesh
   module RpcDSL
     # Declares one rpc. +name+ is the Ruby method name, +target+ the
     # ServiceMesh::Target, +input+ and +output+ the message classes, +kind+
-    # :route or :topic. +output+ is not used for a topic.
-    def rpc(name, target:, input:, kind:, output: nil)
-      rpc = Rpc.new(name: name, target: target, input: input, output: output, kind: kind, owner: self)
+    # :route or :topic, and +consumer_group+ the method's consumer_group
+    # option. +output+ is not used for a topic.
+    def rpc(name, target:, input:, kind:, output: nil, consumer_group: nil)
+      rpc = Rpc.new(name: name, target: target, input: input, output: output, kind: kind, owner: self, consumer_group: consumer_group)
       own_rpcs[rpc.name] = rpc
       define_rpc(rpc)
       rpc

data/lib/grpc_service_mesh/rpc_runtime.rb

@@ -2,32 +2,31 @@
 
 module GrpcServiceMesh
   # The service process for one transport and one deployment group. new
-  # takes the transport's client from the process router and the matching
-  # bindings from the process registry, and builds the transport's Runtime
-  # from them with the +runtime+ constructor.
+  # takes the transport's client from the process router and every endpoint
+  # and subscriber in the process registry whose target is on that transport,
+  # and builds the transport's Runtime from them with the +runtime+
+  # constructor.
   class RPCRuntime
     attr_reader :transport, :deployment_group, :t_runtime
 
     # +runtime+ is ->(client, config, endpoints:, subscribers:) returning the
     # transport's Runtime. It receives +config+ with deployment_group set.
-    # +endpoints+ and +subscribers+, when given, replace the registry's list
-    # of that kind, and [] serves none. Raises ArgumentError for a given
-    # binding whose Target's deployment_group or transport is not this
-    # runtime's, UnknownTransport, and whatever +runtime+ raises.
-    def initialize(transport:, deployment_group:, runtime:, config: {}, endpoints: nil, subscribers: nil)
+    # Endpoints and subscribers of other transports are left for those
+    # transports' runtimes. Raises ArgumentError when +runtime+ is not
+    # callable, UnknownTransport, and whatever +runtime+ raises.
+    def initialize(transport:, deployment_group:, runtime:, config: {})
       raise ArgumentError, "runtime: must be a callable that builds the transport's Runtime, got #{runtime.inspect}" unless runtime.respond_to?(:call)
 
       registry = GrpcServiceMesh.registry
       client = GrpcServiceMesh.transport_router.client(transport)
       @transport = transport
       @deployment_group = deployment_group
-      endpoints&.each { |binding| check_target("endpoint", binding.target) }
-      subscribers&.each { |binding| check_target("subscriber", binding.target) }
+      on_transport = ->(served) { served.target.metadata["transport"] == transport }
       @t_runtime = runtime.call(
         client,
         config.to_h.merge(ServiceMesh::DEPLOYMENT_GROUP_KEY => deployment_group),
-        endpoints: endpoints || registry.endpoints(deployment_group),
-        subscribers: subscribers || registry.subscribers(deployment_group)
+        endpoints: registry.endpoints.select(&on_transport),
+        subscribers: registry.subscribers.select(&on_transport)
       )
     end
 
@@ -38,16 +37,5 @@ module GrpcServiceMesh
     def running? = @t_runtime.running?
 
     def client = @t_runtime.client
-
-    private
-
-    def check_target(kind, target)
-      {ServiceMesh::DEPLOYMENT_GROUP_KEY => @deployment_group, "transport" => @transport}.each do |key, want|
-        got = target.metadata[key]
-        next if got == want
-
-        raise ArgumentError, "#{kind} #{target.segments.inspect} has #{key} #{got.inspect}, want #{want.inspect}"
-      end
-    end
   end
 end

data/lib/grpc_service_mesh/rpc_service.rb

@@ -10,18 +10,28 @@ module GrpcServiceMesh
   class RPCService
     extend RpcDSL
 
-    # A ServiceMesh::Endpoint for each route rpc this instance implements.
+    # A ServiceMesh::Endpoint for each route rpc this instance implements,
+    # with the rpc's consumer_group in its metadata when it has one.
     def endpoints
-      implemented.select(&:route?).map { |rpc| ServiceMesh::Endpoint.new(target: rpc.target, handler: endpoint_handler(rpc)) }
+      implemented.select(&:route?).map do |rpc|
+        ServiceMesh::Endpoint.new(target: rpc.target, handler: endpoint_handler(rpc), metadata: consumer_group_metadata(rpc))
+      end
     end
 
-    # A ServiceMesh::Subscriber for each topic rpc this instance implements.
+    # A ServiceMesh::Subscriber for each topic rpc this instance implements,
+    # with the rpc's consumer_group in its metadata when it has one.
     def subscribers
-      implemented.reject(&:route?).map { |rpc| ServiceMesh::Subscriber.new(target: rpc.target, handler: subscriber_handler(rpc)) }
+      implemented.reject(&:route?).map do |rpc|
+        ServiceMesh::Subscriber.new(target: rpc.target, handler: subscriber_handler(rpc), metadata: consumer_group_metadata(rpc))
+      end
     end
 
     private
 
+    def consumer_group_metadata(rpc)
+      rpc.consumer_group.nil? ? {} : {ServiceMesh::CONSUMER_GROUP_KEY => rpc.consumer_group}
+    end
+
     # Rpcs whose method is defined in the declaring class or below it.
     def implemented
       self.class.rpcs.values.select do |rpc|

data/lib/grpc_service_mesh/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrpcServiceMesh
-  VERSION = "0.16.0"
+  VERSION = "0.17.1"
 end

data/lib/grpc_service_mesh.rb

@@ -35,8 +35,8 @@ module GrpcServiceMesh
     end
 
     # Shortcut for registry.register.
-    def register(service)
-      registry.register(service)
+    def register(service, consumer_groups: {})
+      registry.register(service, consumer_groups: consumer_groups)
     end
   end
 end

data/lib/mesh/options_pb.rb

@@ -7,7 +7,7 @@ require 'google/protobuf'
 require 'google/protobuf/descriptor_pb'
 
 
-descriptor_data = "\n\x12mesh/options.proto\x12\x04mesh\x1a google/protobuf/descriptor.proto*\x1c\n\x04Kind\x12\t\n\x05ROUTE\x10\x00\x12\t\n\x05TOPIC\x10\x01::\n\x04kind\x12\x1e.google.protobuf.MethodOptions\x18\xd1\x86\x03 \x01(\x0e\x32\n.mesh.Kind:8\n\x0e\x63onsumer_group\x12\x1e.google.protobuf.MethodOptions\x18\xd2\x86\x03 \x01(\t:8\n\x10\x64\x65ployment_group\x12\x1c.google.protobuf.FileOptions\x18\xd3\x86\x03 \x01(\t:1\n\ttransport\x12\x1c.google.protobuf.FileOptions\x18\xd4\x86\x03 \x01(\t:3\n\x0broot_prefix\x12\x1c.google.protobuf.FileOptions\x18\xd5\x86\x03 \x01(\tB<Z:github.com/Paymentbox-com/grpc-service-mesh-go/meshoptionsb\x06proto3"
+descriptor_data = "\n\x12mesh/options.proto\x12\x04mesh\x1a google/protobuf/descriptor.proto*\x1c\n\x04Kind\x12\t\n\x05ROUTE\x10\x00\x12\t\n\x05TOPIC\x10\x01::\n\x04kind\x12\x1e.google.protobuf.MethodOptions\x18\xd1\x86\x03 \x01(\x0e\x32\n.mesh.Kind:8\n\x0e\x63onsumer_group\x12\x1e.google.protobuf.MethodOptions\x18\xd2\x86\x03 \x01(\t:1\n\ttransport\x12\x1c.google.protobuf.FileOptions\x18\xd4\x86\x03 \x01(\t:3\n\x0broot_prefix\x12\x1c.google.protobuf.FileOptions\x18\xd5\x86\x03 \x01(\tB<Z:github.com/Paymentbox-com/grpc-service-mesh-go/meshoptionsb\x06proto3"
 
 pool = ::Google::Protobuf::DescriptorPool.generated_pool
 pool.add_serialized_file(descriptor_data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grpc_service_mesh
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Bryant Morrill
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-29 00:00:00.000000000 Z
+date: 2026-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf