griffin-interceptors 0.1.11 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b785b3cafb37b0e0591d0711e53b26234f42e5fa030e97b1abcd0aeea1cdb7ea
-  data.tar.gz: 1088309028a6cc0b5ef0c9eda8d90959877104f7363bec69bc1edc74c99edee4
+  metadata.gz: ffed86abcb2abcde04f6c18a0eca28277125f9828d83c4366d39b3e906fe226d
+  data.tar.gz: a02c68e604410540cf6637f0500b01966c8cf3338fe1d81138a71b3efbe8d8f4
 SHA512:
-  metadata.gz: 185036907e1423ecbfb463ada4759865c59012e3c3fb927821f148a7cec6f5610a0398c8807e8bb44f2777ff9663a7ecdfe6bb87eef5e116c9986df9dca9e4f7
-  data.tar.gz: a5924cd5e8b47d68fb2ca35c0ec9274b983a7e872699921092d0e6f5546048fc583ca149f61c79bbdbfe4a8f080947baac5dbf4f5ddd9e6af8d37432fb2ed5ba
+  metadata.gz: 6d200ccd31a654190d80adf6f5549bc70cf817e5e20859e10c9eca395148a7b85bfbfb2288d2aaf5d485a5865f9a0602c903676d400c32e6009e79dfca7bc31f
+  data.tar.gz: '091fd8f580cea51fe2f8f85c4f18bf913f2c9b85f63fbf17247433223d48b21a82085917b6596dba2347775b8a05b0194fa188ca5fb437a2c514c2a2e00a808a'

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-gem 'sentry-raven'
-
 module Griffin
   module Interceptors
     module Server
@@ -10,13 +8,13 @@ module Griffin
           begin
             yield
           rescue ActiveRecord::RecordNotFound => e
-            Raven.capture_exception(e)
+            capture_exception_if_defined(e)
             raise GRPC::NotFound.new(e.message)
           rescue ActiveRecord::StaleObjectError => e
-            Raven.capture_exception(e)
+            capture_exception_if_defined(e)
             raise GRPC::Aborted.new(e.message)
           rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e
-            Raven.capture_exception(e)
+            capture_exception_if_defined(e)
             raise GRPC::FailedPrecondition.new(e.message)
           end
         end
@@ -24,6 +22,16 @@ module Griffin
         alias_method :server_streamer, :request_response
         alias_method :client_streamer, :request_response
         alias_method :bidi_streamer, :request_response
+
+        private
+
+        def capture_exception_if_defined(e)
+          if defined?(Sentry)
+            Sentry.capture_exception(e)
+          elsif defined?(Raven)
+            Raven.capture_exception(e)
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+gem "sentry-ruby"
+
+module Griffin
+  module Interceptors
+    module Server
+      class SentryInterceptor < GRPC::ServerInterceptor
+        TRANSACTION_OP = "griffin"
+
+        def request_response(request: nil, call: nil, method: nil)
+          return yield unless Sentry.initialized?
+
+          Sentry.clone_hub_to_current_thread
+
+          Sentry.with_scope do |scope|
+            Sentry.with_session_tracking do
+              scope.clear_breadcrumbs
+
+              service_name = call.service_name
+              method_name = method.name
+              scope.set_transaction_name("#{service_name}/#{method_name}")
+
+              transaction = start_transaction(call.metadata, scope)
+              scope.set_span(transaction) if transaction
+
+              if call.metadata["x-request-id"]
+                scope.set_tags(request_id: call.metadata["x-request-id"])
+              end
+
+              begin
+                response = yield
+              rescue GRPC::BadStatus => e
+                finish_transaction(transaction, e.code)
+                raise e
+              rescue => e
+                GRPC.logger.error("Internal server error: #{e}")
+                finish_transaction(transaction, GrpcKit::StatusCodes::INTERNAL)
+                Sentry.capture_exception(e)
+
+                raise GRPC::Unknown.new("Internal server error")
+              end
+
+              finish_transaction(transaction, GrpcKit::StatusCodes::OK)
+
+              response
+            end
+          end
+        end
+
+        alias_method :server_streamer, :request_response
+        alias_method :client_streamer, :request_response
+        alias_method :bidi_streamer, :request_response
+
+        private
+
+        def start_transaction(metadata, scope)
+          sentry_trace = metadata["grpc-sentry-trace"]
+          options = { name: scope.transaction_name, op: TRANSACTION_OP }
+          transaction = Sentry::Transaction.from_sentry_trace(sentry_trace, **options) if sentry_trace
+          Sentry.start_transaction(transaction: transaction, custom_sampling_context: { metadata: metadata }, **options)
+        end
+
+        def finish_transaction(transaction, status_code)
+          return unless transaction
+
+          transaction.set_http_status(status_code)
+          transaction.finish
+        end
+      end
+    end
+  end
+end

data/lib/griffin/interceptors/version.rb

@@ -1,5 +1,5 @@
 module Griffin
   module Interceptors
-    VERSION = '0.1.11'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griffin-interceptors
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuta Iwama
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: get_process_mem
@@ -126,6 +126,7 @@ files:
 - lib/griffin/interceptors/server/rails_exception_interceptor.rb
 - lib/griffin/interceptors/server/raven_interceptor.rb
 - lib/griffin/interceptors/server/scout_apm_interceptor.rb
+- lib/griffin/interceptors/server/sentry_interceptor.rb
 - lib/griffin/interceptors/server/timeout_interceptor.rb
 - lib/griffin/interceptors/server/worker_killer_interceptor.rb
 - lib/griffin/interceptors/server/x_request_id_interceptor.rb
@@ -149,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A collection of interceptors for griffin