griffin-interceptors 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69d23b2ed7f3196a4c72393c88145cf9c2927f5d36c005bc5ab0773b4343142f
-  data.tar.gz: d8eb1abff86e60b36952ccdfc1890a9ff247e44f900f4c409d6b549958586291
+  metadata.gz: 239fb7f3036b63120fdeb63eeb5504848b95a1e89d34708186fec7fb7b492203
+  data.tar.gz: de98b38b9a0ee827b439948cf0179da9ab2f2bcb08b06da2db05de23403a95fa
 SHA512:
-  metadata.gz: 85155625fcab199a6289766fbe30b3bcf19609cfd3493243c5f7e0d4573f63baa2dc1cf4437f6b0f51d5fbc1dcc01a7f8c76b33691a3e26c5a7707e6c454564a
-  data.tar.gz: b0018e9838a89b0f455a48a680f4ff42d663624a214df34f7812f32efdbff639096c0bd8a424355df2841e1061254ea0bc61c836fa4f32bb3a25719b41d26c91
+  metadata.gz: 5051fa9479be355ae9a5982dfffd6896149c7261e9bea9f75ab8db3d72752eda04546eeeb12fdcb52b672bc7a60b7420806c1e782482dfa57b426b818bfee014
+  data.tar.gz: f6eec90328bd4aa6e7617a9b2bacdbcf7512565d3b97186ef39ff98a49fb74719c84c94270c8170959c9ea5402993434593ffb88c83cbc3dd0c1e8ab27732ac0

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/version.rb

@@ -1,5 +1,5 @@
 module Griffin
   module Interceptors
-    VERSION = '0.1.8'.freeze
+    VERSION = '0.1.9'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griffin-interceptors
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Yuta Iwama
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: get_process_mem
@@ -133,7 +133,7 @@ homepage: https://github.com/cookpad/griffin-interceptors
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A collection of interceptors for griffin
 test_files: []