grpcx 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a99773353852adc153af1cda72a8c17e980687c69127bb9a7830d983fd4a052d
-  data.tar.gz: 415a8d6f395db5283f57c9756ed47483560b8b1365ff224090a88f6a5dba02b1
+  metadata.gz: 66a39ca3d81a4f36e3ec546252755dc6c8f5a93e77dee26824b935260ced5973
+  data.tar.gz: f26e9038ee971c5bd1fcde6be56fc0b19c37e3a195a8474800f5395c18ee0878
 SHA512:
-  metadata.gz: 8a92a53f2e0fe302482ca483f4434a35f274045d97ebc77c63e11a425f3c591d31bbcbdec2ed013a0c296fefbaf9ad514ecdc45ad8dbfc9143acde905d767933
-  data.tar.gz: 775e2e820a35bc874ab36090e3328c72954545653d5dec0a02ee3608aa4b836d88742b17b49a0845dc8e5897db6871464e9978b87f704a03819f23c4bd21971b
+  metadata.gz: c90478efde02ea7793cb23a884d3e99ffe4692ed938299da1d391664e18116c3f5c4d938100d9ca0fdd1e56925bd10aba47b3d986b2f0cdb1f93bcef67457c1f
+  data.tar.gz: 5c29233c1760993563acc0875792d669505ebd5e18ea4443e441ba807dacd59b5418fa7573834694607abbdddf55b8da1192f40158894e39359dfceea0c593af

data/.rubocop.yml

@@ -1,9 +1,5 @@
 inherit_from:
-  - https://storage.googleapis.com/bsm-misc/rubocop.yml
+  - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
 
 AllCops:
-  TargetRubyVersion: 2.2
-
-Metrics/AbcSize:
-  Enabled: false
-
+  TargetRubyVersion: 2.5

data/Gemfile.lock

@@ -1,70 +1,70 @@
 PATH
   remote: .
   specs:
-    grpcx (0.2.0)
+    grpcx (0.3.0)
       activesupport (>= 5.0)
       grpc (>= 1.8.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
-      arel (>= 9.0)
-    activesupport (5.2.1)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.2)
     ast (2.4.0)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    google-protobuf (3.6.1)
-    googleapis-common-protos-types (1.0.2)
+    google-protobuf (3.11.4)
+    googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
-    grpc (1.14.2)
-      google-protobuf (~> 3.1)
-      googleapis-common-protos-types (~> 1.0.0)
-    i18n (1.1.0)
+    grpc (1.27.0)
+      google-protobuf (~> 3.11)
+      googleapis-common-protos-types (~> 1.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1)
-    minitest (5.11.3)
-    parallel (1.12.1)
-    parser (2.5.1.2)
+    jaro_winkler (1.5.4)
+    minitest (5.14.0)
+    parallel (1.19.1)
+    parser (2.7.0.4)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
     rainbow (3.0.0)
-    rake (12.3.1)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rake (13.0.1)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.59.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.6.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -78,4 +78,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.16.4
+   2.1.4

data/README.md

@@ -50,37 +50,11 @@ end
 
 ## Using with [Datadog::Notifications](https://github.com/bsm/datadog-notifications)
 
-```ruby
-# TODO: update this in datadog-notifications gem itself (to handle new service/action payloads)
-module Datadog::Notifications::Plugins
-  class MyGRPC < Base
-
-    def initialize(opts={})
-      super
-      Datadog::Notifications.subscribe(Grpcx::Server::Interceptors::Instrumentation::METRIC_NAME) do |reporter, event|
-        record(reporter, event)
-      end
-    end
-
-    private
-
-    def record(reporter, event)
-      service = event.payload[:service]
-      action  = event.payload[:action]
-      status  = event.payload[:exception] ? 'error' : 'ok'
-      tags = self.tags + %W[service:#{service} action:#{action} status:#{status}]
-
-      reporter.batch do
-        reporter.increment 'grpc.request', tags: tags
-        reporter.timing 'grpc.request.time', event.duration, tags: tags
-      end
-    end
-
-  end
-end
+Since version >= [0.5.4](https://github.com/bsm/datadog-notifications/releases/tag/v0.5.4)
 
+```ruby
 Datadog::Notifications.configure do |c|
-  c.use Datadog::Notifications::Plugins::MyGRPC
+  c.use Datadog::Notifications::Plugins::GRPC
 end if RUNNING_IN_PROD?
 ```
 

data/grpcx.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'grpcx'
-  s.version       = '0.2.0'
+  s.version       = '0.3.0'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(gRPC extensions/helpers)
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^spec/}) }
   s.test_files    = `git ls-files -z -- spec/*`.split("\x0")
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.2'
+  s.required_ruby_version = '>= 2.5'
 
   s.add_dependency 'activesupport', '>= 5.0'
   s.add_dependency 'grpc', '>= 1.8.0'

data/lib/grpcx/entity.rb

@@ -10,11 +10,11 @@ module Grpcx
 
     module_function
 
-    TRUE_VALUES = [true, 1, "1", "t", "T", "true", "TRUE", "on", "ON"].to_set.freeze
+    TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE', 'on', 'ON'].to_set.freeze
 
     # @param [Class] msgclass messagepack message class
     # @param [Hash] attrs attributes to assign
-    def build(msgclass, attrs={}) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    def build(msgclass, attrs = {}) # rubocop:disable Metrics/MethodLength
       attrs  = ActiveSupport::HashWithIndifferentAccess.new(attrs)
       fields = {}
       msgclass.descriptor.each do |field| # rubocop:disable Metrics/BlockLength

data/lib/grpcx/server.rb

@@ -22,7 +22,7 @@ module Grpcx
       end
     end
 
-    def initialize(opts={})
+    def initialize(opts = {})
       opts[:pool_size] ||= ENV['GRPC_SERVER_THREADS'].to_i if ENV['GRPC_SERVER_THREADS']
       opts[:max_waiting_requests] ||= ENV['GRPC_SERVER_QUEUE'].to_i if ENV['GRPC_SERVER_QUEUE']
 

data/lib/grpcx/server/interceptors/active_record.rb

@@ -5,7 +5,6 @@ module Grpcx
       # making sure that connection is established before each request
       # and re-pooling connections when request is processed.
       class ActiveRecord < GRPC::ServerInterceptor
-
         def request_response(*, &block)
           wrap(&block)
         end
@@ -30,7 +29,6 @@ module Grpcx
         ensure
           ::ActiveRecord::Base.clear_active_connections!
         end
-
       end
     end
   end

data/lib/grpcx/server/interceptors/instrumentation.rb

@@ -6,19 +6,19 @@ module Grpcx
       class Instrumentation < GRPC::ServerInterceptor
         METRIC_NAME = 'process_action.grpc'.freeze
 
-        def request_response(opts={}, &block)
+        def request_response(opts = {}, &block)
           instrument(opts[:method], &block)
         end
 
-        def client_streamer(opts={}, &block)
+        def client_streamer(opts = {}, &block)
           instrument(opts[:method], &block)
         end
 
-        def server_streamer(opts={}, &block)
+        def server_streamer(opts = {}, &block)
           instrument(opts[:method], &block)
         end
 
-        def bidi_streamer(opts={}, &block)
+        def bidi_streamer(opts = {}, &block)
           instrument(opts[:method], &block)
         end
 
@@ -29,7 +29,6 @@ module Grpcx
           action = method.name # does not match real proto service name; it's a GRPC::GenericService.underscore-d version
           ActiveSupport::Notifications.instrument(METRIC_NAME, service: service, action: action, &block)
         end
-
       end
     end
   end

data/lib/grpcx/server/interceptors/rescue.rb

@@ -2,35 +2,34 @@ module Grpcx
   module Server
     module Interceptors
       class Rescue < GRPC::ServerInterceptor
-        def initialize(rescuable, opts={})
+        def initialize(rescuable, opts = {})
           @rescuable = rescuable
           super(opts)
         end
 
         def request_response(*)
           yield
-        rescue StandardError => err
-          @rescuable.rescue_with_handler(err) || raise
+        rescue StandardError => e
+          @rescuable.rescue_with_handler(e) || raise
         end
 
         def client_streamer(*)
           yield
-        rescue StandardError => err
-          @rescuable.rescue_with_handler(err) || raise
+        rescue StandardError => e
+          @rescuable.rescue_with_handler(e) || raise
         end
 
         def server_streamer(*)
           yield
-        rescue StandardError => err
-          @rescuable.rescue_with_handler(err) || raise
+        rescue StandardError => e
+          @rescuable.rescue_with_handler(e) || raise
         end
 
         def bidi_streamer(*)
           yield
-        rescue StandardError => err
-          @rescuable.rescue_with_handler(err) || raise
+        rescue StandardError => e
+          @rescuable.rescue_with_handler(e) || raise
         end
-
       end
     end
   end

data/spec/lib/entity_spec.rb

@@ -1,19 +1,18 @@
 require 'spec_helper'
 
 RSpec.describe Grpcx::Entity do
-
   it 'should build messages' do
     msg = described_class.build Grpcx::Spec::Message,
-      name: 'Name',
-      version: 1,
-      types: {
-        num: 8,
-        truth: [1, 0, true, 'true'],
-        decimal: '1.2',
-      }
+                                name: 'Name',
+                                version: 1,
+                                types: {
+                                  num: 8,
+                                  truth: [1, 0, true, 'true'],
+                                  decimal: '1.2',
+                                }
 
     expect(msg.to_h).to eq(
-      name: "Name",
+      name: 'Name',
       version: :V1,
       types: {
         num: 8,
@@ -22,5 +21,4 @@ RSpec.describe Grpcx::Entity do
       },
     )
   end
-
 end

data/spec/lib/server_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 RSpec.describe Grpcx::Server do
-
   subject do
     s = Grpcx::Spec::Server.new
     s.handle Grpcx::Spec::Service::V1
@@ -31,5 +30,4 @@ RSpec.describe Grpcx::Server do
       ArgumentError
     ]
   end
-
 end

data/spec/spec_helper.rb

@@ -4,30 +4,30 @@ require 'active_record'
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "grpcx.spec.Message" do
+  add_message 'grpcx.spec.Message' do
     optional :name, :string, 1
-    optional :version, :enum, 2, "grpcx.spec.Version"
-    optional :types, :message, 3, "grpcx.spec.Types"
+    optional :version, :enum, 2, 'grpcx.spec.Version'
+    optional :types, :message, 3, 'grpcx.spec.Types'
   end
-  add_message "grpcx.spec.Types" do
+  add_message 'grpcx.spec.Types' do
     optional :num, :int64, 1
     repeated :truth, :bool, 2
     optional :decimal, :double, 3
   end
-  add_enum "grpcx.spec.Version" do
+  add_enum 'grpcx.spec.Version' do
     value :V0, 0
     value :V1, 1
     value :V2, 2
   end
-  add_message "grpcx.spec.GetMessageRequest" do
+  add_message 'grpcx.spec.GetMessageRequest' do
   end
 end
 
 module Grpcx::Spec
-  Message = Google::Protobuf::DescriptorPool.generated_pool.lookup("grpcx.spec.Message").msgclass
-  Version = Google::Protobuf::DescriptorPool.generated_pool.lookup("grpcx.spec.Version").enummodule
-  Types = Google::Protobuf::DescriptorPool.generated_pool.lookup("grpcx.spec.Types").msgclass
-  GetMessageRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("grpcx.spec.GetMessageRequest").msgclass
+  Message = Google::Protobuf::DescriptorPool.generated_pool.lookup('grpcx.spec.Message').msgclass
+  Version = Google::Protobuf::DescriptorPool.generated_pool.lookup('grpcx.spec.Version').enummodule
+  Types = Google::Protobuf::DescriptorPool.generated_pool.lookup('grpcx.spec.Types').msgclass
+  GetMessageRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup('grpcx.spec.GetMessageRequest').msgclass
 
   module Service
     class V1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpcx
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -145,15 +145,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: gRPC extensions/helpers