protobuf 3.10.5 → 3.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e3465827a6baf50d8cb30a689bd13858d7423390f2cb0405929e494578bac2a
-  data.tar.gz: 88b6210d9bbe3323a8b7f81e3c3d6f5d3c6cb404637a31fe04ff57a6bb2a4c2e
+  metadata.gz: 4ea13b6353fc56a116dc91e87662ffaaac8c4b8cb27dd85be480797e7ef922d2
+  data.tar.gz: 6f5804860b80527356f1a6cec79def05499abd4a5536038c453e7e65cd05c237
 SHA512:
-  metadata.gz: 2d84ed2d0d670143cf9d59e664a7ad3e50ad8e0f1293594f5784f249e63b81e5d9ebfe55d1defbc8b1c058333b6faba72e217929dec752dedf87a58758310941
-  data.tar.gz: 5119bb0a3370b04323883962b6f8bd56c9c319a95155e83793bbc69d7879b1a75923e2e4c3164593adddd0aaceda7e18031a07b9badc0562ded3b698a1f4d481
+  metadata.gz: a49491b32df80049107f59673008d6f8ac64977abcae332ad407c120f9f9628f4c3b47dbd5f809b8843ce477e02286da3fc1242131a8919ddac7170e2002bbf4
+  data.tar.gz: b5352584a6c79b77ce1360fb0ce6a03c00a165cdfb8f92b96aaf61d37a3acf7a89f7bd4bd2fc8a3f1c879434b941db3e0689040edf5988cee2c05cb5bfd0a3a5

data/.circleci/config.yml

@@ -42,7 +42,5 @@ workflows:
               ruby-image:
                 - circleci/jruby:9.2.6.0-jdk
                 - circleci/jruby:9.1.17.0-jdk
-                - circleci/jruby:9.2-jdk8
-                - circleci/ruby:2.4
                 - circleci/ruby:2.5
                 - circleci/ruby:2.7

data/lib/protobuf/rpc/error.rb

@@ -13,12 +13,12 @@ module Protobuf
         super message
       end
 
-      def encode
-        to_response.encode
+      def encode(args = {})
+        to_response(args).encode
       end
 
-      def to_response
-        ::Protobuf::Socketrpc::Response.new(:error => message, :error_reason => error_type)
+      def to_response(args = {})
+        ::Protobuf::Socketrpc::Response.new({ :error => message, :error_reason => error_type }.merge(args))
       end
     end
   end

data/lib/protobuf/rpc/middleware/exception_handler.rb

@@ -22,7 +22,7 @@ module Protobuf
           # Rescue exceptions, re-wrap them as generic Protobuf errors,
           # and encode them
           env.response = wrap_exception(exception)
-          env.encoded_response = env.response.encode
+          env.encoded_response = wrap_and_encode_with_server(env.response, env)
           env
         end
 
@@ -34,6 +34,17 @@ module Protobuf
           exception = RpcFailed.new(exception.message) unless exception.is_a?(PbError)
           exception
         end
+
+        # If the response is a PbError, it won't have the server merged into the response proto.
+        # We should add it here since exception handler is always at the bottom of the middleware
+        # stack. Without this, the server hostname in the client rpc log will not be set.
+        def wrap_and_encode_with_server(response, env)
+          if response.is_a?(PbError)
+            response.encode(:server => env.server)
+          else
+            response.encode
+          end
+        end
       end
     end
   end

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.10.5' # rubocop:disable Style/MutableConstant
+  VERSION = '3.10.6' # rubocop:disable Style/MutableConstant
 end

data/spec/lib/protobuf/rpc/middleware/exception_handler_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe Protobuf::Rpc::Middleware::ExceptionHandler do
   let(:app) { proc { |env| env } }
-  let(:env) { Protobuf::Rpc::Env.new }
+  let(:env) { Protobuf::Rpc::Env.new("server" => "cooldude") }
 
   subject { described_class.new(app) }
 
@@ -17,7 +17,7 @@ RSpec.describe Protobuf::Rpc::Middleware::ExceptionHandler do
     end
 
     context "when exceptions occur" do
-      let(:encoded_error) { error.encode }
+      let(:encoded_error) { error.encode(:server => "cooldude") }
       let(:error) { Protobuf::Rpc::MethodNotFound.new('Boom!') }
 
       before { allow(app).to receive(:call).and_raise(error, 'Boom!') }
@@ -42,7 +42,7 @@ RSpec.describe Protobuf::Rpc::Middleware::ExceptionHandler do
       end
 
       context "when exception is not a Protobuf error" do
-        let(:encoded_error) { error.encode }
+        let(:encoded_error) { error.encode(:server => "cooldude") }
         let(:error) { Protobuf::Rpc::RpcFailed.new('Boom!') }
 
         before { allow(app).to receive(:call).and_raise(RuntimeError, 'Boom!') }

data/spec/lib/protobuf/rpc/stat_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'timecop'
-require 'active_support/core_ext/numeric/time'
+require 'active_support/all'
 
 RSpec.describe ::Protobuf::Rpc::Stat do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.10.5
+  version: 3.10.6
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -486,7 +486,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.27
+rubygems_version: 3.2.28
 signing_key:
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.