griffin-interceptors 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eaf4ab1433928865a32bd22d19c1283f826ea526
-  data.tar.gz: 43d9b6c7f9a636fa79ae6e4adf8800c0c5326952
+SHA256:
+  metadata.gz: 577b6e15c3329e7de3161208786195c3c294b0cd2b049dbac28cd65760ac69aa
+  data.tar.gz: 4b2b4735f2ddcaec02fd0edc7a7008383fc16d21153124b97c0ebe751a6b5039
 SHA512:
-  metadata.gz: 57917963336f2b3ba83d84da9c3c59d2c2ac3b3352317375307facadd00b55edc8d415c72c3015bfc4d70295fc1bb06211d4f0c17b382666dc3bd323514f0e6f
-  data.tar.gz: 6f198f8b51e9a9afd723cc6d285307685e226941af9ed51f67a465a9e193c4853a1c21fbd3bf834db08f7bd8a1682cc96cae0e21cc74643728c8e6cf4fd5ae6e
+  metadata.gz: 78ed7afe5b35e0f2d501993c627a063a76d843430e4a96855dc7495048c8dc8633b96d1c3cd009b2734168740f00b100aeaaf0e983d8ba437a80816507afcc76
+  data.tar.gz: 69ed67e1d0ae800429004c3d732b95ac582fac407b0c5dba5d360bae2d50ec0df2b27d313599b0b42b65f61d913327b5c2abdb9e7fca87714cbcab129a08cfbe

data/lib/griffin/interceptors/server/filtered_payload_interceptor.rb

@@ -2,8 +2,8 @@
 
 require 'griffin/interceptors/server/payload_interceptor'
 
-# Check actionpack exists to use ActionDispatch::Http::ParameterFilter
-gem 'actionpack'
+# Check actionpack exists to use ActionDispatch::Http::ParameterFilter if needed
+gem 'actionpack' unless defined?(ActiveSupport::ParameterFilter)
 
 module Griffin
   module Interceptors
@@ -19,7 +19,13 @@ module Griffin
             end
           end
 
-          @parameter_filter = ActionDispatch::Http::ParameterFilter.new(@filters)
+          # ActionDispatch::Http::ParameterFilter is deprecated and will be removed from Rails 6.1.
+          parameter_filter_klass = if defined?(ActiveSupport::ParameterFilter)
+              ActiveSupport::ParameterFilter
+            else
+              ActionDispatch::Http::ParameterFilter
+            end
+          @parameter_filter = parameter_filter_klass.new(@filters)
         end
 
         def server_streamer(call: nil, **)

data/lib/griffin/interceptors/server/logging_interceptor.rb

@@ -45,7 +45,7 @@ module Griffin
             'grpc.code' => '0', # OK
           }
 
-          if call.metadata['x-requst-id']
+          if call.metadata['x-request-id']
             log['grpc.x_request_id'] = call.metadata['x-request-id']
           end
 

data/lib/griffin/interceptors/server/newrelic_interceptor.rb

@@ -19,26 +19,14 @@ module Griffin
 
           return yield if @ignored_services.include?(service_name)
 
-          transaction_name = build_transaction_name(service_name, method.name)
-          state = NewRelic::Agent::TransactionState.tl_get
-
           # gRPC's HTTP method is fixed. https://github.com/grpc/grpc/blob/af89e8c00e796f3398b09b7daed693df2b14da56/doc/PROTOCOL-HTTP2.md
-          req = Request.new("/#{transaction_name}", call.metadata['user-agent'], 'POST')
-          # ":controller" is not correct category name for gRPC, But since we want to categorized this transaction as web transactions.
-          # https://docs.newrelic.com/docs/apm/transactions/key-transactions/introduction-key-transactions
-          NewRelic::Agent::Transaction.start(state, :controller, transaction_name: "Controller/#{transaction_name}", request: req)
-
-          begin
-            resp = yield
-            # gRPC alway returns HTTP status code 200
-            state.current_transaction.http_response_code = '200'
-
-            resp
-          rescue => e
-            NewRelic::Agent::Transaction.notice_error(e)
-            raise e
-          ensure
-            NewRelic::Agent::Transaction.stop(state)
+          request = Request.new("/#{service_name}/#{method.name}", call.metadata['user-agent'], 'POST')
+
+          in_transaction("#{service_name}/#{method.name}", request) do |txn|
+            yield.tap do
+              # gRPC always returns HTTP status code 200.
+              txn.http_response_code = '200'
+            end
           end
         end
 
@@ -46,8 +34,21 @@ module Griffin
 
         private
 
-        def build_transaction_name(service, mthd)
-          "#{service}/#{mthd}"
+        if Gem::Version.new(NewRelic::VERSION::STRING) >= Gem::Version.new('6.0.0')
+          def in_transaction(partial_name, request)
+            NewRelic::Agent::Tracer.in_transaction(partial_name: partial_name, category: :web, options: { request: request }) do
+              yield NewRelic::Agent::Tracer.current_transaction
+            end
+          end
+        else
+          def in_transaction(partial_name, request)
+            state = NewRelic::Agent::TransactionState.tl_get
+            # Specify the controller category so that the transaction gets categorized as a web transaction.
+            # See https://github.com/newrelic/newrelic-ruby-agent/blob/5.7.0.350/lib/new_relic/agent/transaction.rb#L39.
+            NewRelic::Agent::Transaction.wrap(state, "Controller/#{partial_name}", :controller, request: request) do
+              yield state.current_transaction
+            end
+          end
         end
       end
     end

data/lib/griffin/interceptors/server/raven_interceptor.rb

@@ -6,7 +6,11 @@ module Griffin
   module Interceptors
     module Server
       class RavenInterceptor < GRPC::ServerInterceptor
-        def request_response(*)
+        def request_response(call: nil, **)
+          if call.metadata['x-request-id']
+            Raven.tags_context(request_id: call.metadata['x-request-id'])
+          end
+
           begin
             yield
           rescue => e
@@ -17,6 +21,9 @@ module Griffin
 
             raise GRPC::Unknown.new('Internal server error')
           end
+        ensure
+          Raven::Context.clear!
+          Raven::BreadcrumbBuffer.clear!
         end
 
         alias_method :server_streamer, :request_response

data/lib/griffin/interceptors/version.rb

@@ -1,5 +1,5 @@
 module Griffin
   module Interceptors
-    VERSION = '0.1.5'.freeze
+    VERSION = '0.1.10'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griffin-interceptors
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.10
 platform: ruby
 authors:
 - Yuta Iwama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: get_process_mem
@@ -148,8 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A collection of interceptors for griffin