protobuf 3.10.0 → 3.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 278b7883f457cfa823f9c9d0d4330b1978086a0ad4d1b3e08cb479fbde256f15
-  data.tar.gz: d1e6232e9a9b1074d66f35c4790d5590f48775f5dec73fb2f15777f11b505ddf
+  metadata.gz: 8631e0e157cd16a50b428ca4888a48d8b294002e1844beca975db88c696038ed
+  data.tar.gz: 9111c88f5b491c625155ce1ee683f0462778a3b7ae9e49671333275e9829bca0
 SHA512:
-  metadata.gz: ce7aac680a1638e2dd848869ee2d002bc1c0554f9d37831843cbdfd18fff370377958e3f5ae8d72e610256e4e7bc83ff23bf3062fef05bb7985e9670d6855f01
-  data.tar.gz: caaae07d19d4299b3d216c803151ce2965604723ba6e5fa6cbcfb246c8ae1d2eefc0413be02d5d196b7189cf134cbe070d1be1ccb7d29bea1072074c22347b3a
+  metadata.gz: bb3d3ee59579cb21771885ebd0ee7bda1e0aa09736cfc15b3053ca9b6206769b5e4eaa2ea8b8ad4d3fb77a85b0dfc985cd69012bda90c0ee23d8e673aed6e373
+  data.tar.gz: feb9889203fa3fc6d33c6efeb74fe8a22ccca41af5bb1f3e15f517ce0a1b8fff07b5a1145117f056dbd5a314498ea70851240dd77969fd7b82742b700e5d1bea

data/lib/protobuf/rpc/connectors/base.rb

@@ -63,8 +63,9 @@ module Protobuf
         # @param [String] message The error message
         def failure(code, message)
           @error = ClientError.new
-          @error.code = ::Protobuf::Socketrpc::ErrorReason.fetch(code)
+          @stats.status = @error.code = ::Protobuf::Socketrpc::ErrorReason.fetch(code)
           @error.message = message
+
           logger.debug { sign_message("Server failed request (invoking on_failure): #{@error.inspect}") }
 
           @failure_cb.call(@error) unless @failure_cb.nil?

data/lib/protobuf/rpc/stat.rb

@@ -1,16 +1,30 @@
 require 'date'
 require 'time'
 require 'protobuf/logging'
+require 'protobuf/rpc/rpc.pb'
 
 module Protobuf
   module Rpc
     class Stat
       attr_accessor :mode, :start_time, :end_time, :request_size, :dispatcher
-      attr_accessor :response_size, :client, :service, :method_name
+      attr_accessor :response_size, :client, :service, :method_name, :status
       attr_reader   :server
 
       MODES = [:SERVER, :CLIENT].freeze
 
+      ERROR_TRANSLATIONS = {
+        ::Protobuf::Socketrpc::ErrorReason::BAD_REQUEST_DATA => "BAD_REQUEST_DATA",
+        ::Protobuf::Socketrpc::ErrorReason::BAD_REQUEST_PROTO => "BAD_REQUEST_PROTO",
+        ::Protobuf::Socketrpc::ErrorReason::SERVICE_NOT_FOUND => "SERVICE_NOT_FOUND",
+        ::Protobuf::Socketrpc::ErrorReason::METHOD_NOT_FOUND => "METHOD_NOT_FOUND",
+        ::Protobuf::Socketrpc::ErrorReason::RPC_ERROR => "RPC_ERROR",
+        ::Protobuf::Socketrpc::ErrorReason::RPC_FAILED => "RPC_FAILED",
+        ::Protobuf::Socketrpc::ErrorReason::INVALID_REQUEST_PROTO => "INVALID_REQUEST_PROTO",
+        ::Protobuf::Socketrpc::ErrorReason::BAD_RESPONSE_PROTO => "BAD_RESPONSE_PROTO",
+        ::Protobuf::Socketrpc::ErrorReason::UNKNOWN_HOST => "UNKNOWN_HOST",
+        ::Protobuf::Socketrpc::ErrorReason::IO_ERROR => "IO_ERROR",
+      }.freeze
+
       def initialize(mode = :SERVER)
         @mode = mode
         @request_size = 0
@@ -78,6 +92,12 @@ module Protobuf
         @mode == :CLIENT
       end
 
+      def status_string
+        return "OK" if status.nil?
+
+        ERROR_TRANSLATIONS.fetch(status, "UNKNOWN_ERROR")
+      end
+
       def to_s
         [
           server? ? "[SRV]" : "[CLT]",
@@ -86,6 +106,7 @@ module Protobuf
           rpc,
           sizes,
           elapsed_time,
+          status_string,
           @end_time.try(:iso8601),
         ].compact.join(' - ')
       end
@@ -93,7 +114,6 @@ module Protobuf
       def trace_id
         ::Thread.current.object_id.to_s(16)
       end
-
     end
   end
 end

data/lib/protobuf/version.rb

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

data/spec/lib/protobuf/rpc/connectors/base_spec.rb

@@ -187,14 +187,14 @@ RSpec.describe Protobuf::Rpc::Connectors::Base do
   shared_examples "a ConnectorDisposition" do |meth, cb, *args|
 
     it "calls #complete before exit" do
-      subject.stats = double("Object", :stop => true)
+      subject.stats = ::Protobuf::Rpc::Stat.new(:stop => true)
 
       expect(subject).to receive(:complete)
       subject.method(meth).call(*args)
     end
 
     it "calls the #{cb} callback when provided" do
-      stats = double("Object")
+      stats = ::Protobuf::Rpc::Stat.new
       allow(stats).to receive(:stop).and_return(true)
       subject.stats = stats
       some_cb = double("Object")
@@ -205,7 +205,7 @@ RSpec.describe Protobuf::Rpc::Connectors::Base do
     end
 
     it "calls the complete callback when provided" do
-      stats = double("Object")
+      stats = ::Protobuf::Rpc::Stat.new
       allow(stats).to receive(:stop).and_return(true)
       subject.stats = stats
       comp_cb = double("Object")
@@ -217,8 +217,8 @@ RSpec.describe Protobuf::Rpc::Connectors::Base do
 
   end
 
-  it_behaves_like("a ConnectorDisposition", :failure, "failure_cb", "code", "message")
-  it_behaves_like("a ConnectorDisposition", :failure, "complete_cb", "code", "message")
+  it_behaves_like("a ConnectorDisposition", :failure, "failure_cb", :RPC_ERROR, "message")
+  it_behaves_like("a ConnectorDisposition", :failure, "complete_cb", :RPC_ERROR, "message")
   it_behaves_like("a ConnectorDisposition", :succeed, "complete_cb", "response")
   it_behaves_like("a ConnectorDisposition", :succeed, "success_cb", "response")
   it_behaves_like("a ConnectorDisposition", :complete, "complete_cb")

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

@@ -33,7 +33,7 @@ RSpec.describe ::Protobuf::Rpc::Stat do
 
         ::Timecop.freeze(1.62.seconds.from_now) do
           stats.stop
-          expect(stats.to_s).to eq "[SRV] - myserver1 - #{stats.trace_id} - BarService#find_bars - 43B/1302B - 1.62s - #{::Time.now.iso8601}"
+          expect(stats.to_s).to eq "[SRV] - myserver1 - #{stats.trace_id} - BarService#find_bars - 43B/1302B - 1.62s - OK - #{::Time.now.iso8601}"
         end
       end
     end
@@ -44,7 +44,7 @@ RSpec.describe ::Protobuf::Rpc::Stat do
         stats.client = 'myserver1'
         stats.dispatcher = double('dispatcher', :service => BarService.new(:find_bars))
         stats.request_size = 43
-        expect(stats.to_s).to eq "[SRV] - myserver1 - #{stats.trace_id} - BarService#find_bars - 43B/-"
+        expect(stats.to_s).to eq "[SRV] - myserver1 - #{stats.trace_id} - BarService#find_bars - 43B/- - OK"
       end
     end
   end
@@ -61,12 +61,31 @@ RSpec.describe ::Protobuf::Rpc::Stat do
 
         ::Timecop.freeze(0.832.seconds.from_now) do
           stats.stop
-          expect(stats.to_s).to eq "[CLT] - myserver1.myhost.com:30000 - #{stats.trace_id} - Foo::BarService#find_bars - 37B/12345B - 0.832s - #{::Time.now.iso8601}"
+          expect(stats.to_s).to eq "[CLT] - myserver1.myhost.com:30000 - #{stats.trace_id} - Foo::BarService#find_bars - 37B/12345B - 0.832s - OK - #{::Time.now.iso8601}"
         end
 
       end
     end
 
+    describe 'error log' do
+      it 'resolves error to a string' do
+        ::Timecop.freeze(10.minutes.ago) do
+          stats = ::Protobuf::Rpc::Stat.new(:CLIENT)
+          stats.server = ['30000', 'myserver1.myhost.com']
+          stats.service = 'Foo::BarService'
+          stats.status = ::Protobuf::Socketrpc::ErrorReason::RPC_ERROR
+          stats.method_name = 'find_bars'
+          stats.request_size = 37
+          stats.response_size = 12345
+
+          ::Timecop.freeze(0.832.seconds.from_now) do
+            stats.stop
+            expect(stats.to_s).to eq "[CLT] - myserver1.myhost.com:30000 - #{stats.trace_id} - Foo::BarService#find_bars - 37B/12345B - 0.832s - RPC_ERROR - #{::Time.now.iso8601}"
+          end
+        end
+      end
+    end
+
     context 'when request is still running' do
       it 'omits response size, duration, and timestamp' do
         stats = ::Protobuf::Rpc::Stat.new(:CLIENT)
@@ -74,7 +93,7 @@ RSpec.describe ::Protobuf::Rpc::Stat do
         stats.service = 'Foo::BarService'
         stats.method_name = 'find_bars'
         stats.request_size = 37
-        expect(stats.to_s).to eq "[CLT] - myserver1.myhost.com:30000 - #{stats.trace_id} - Foo::BarService#find_bars - 37B/-"
+        expect(stats.to_s).to eq "[CLT] - myserver1.myhost.com:30000 - #{stats.trace_id} - Foo::BarService#find_bars - 37B/- - OK"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.1
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport