Merge pull request #5313 from rmosolgo/sentry-nil-span-fix

Sentry trace: handle nil current_span

Author: rmosolgo

lib/graphql/tracing/sentry_trace.rb

@@ -64,8 +64,7 @@ def operation_name(query)
 
         class Event < MonitorTrace::Monitor::Event
           def start
-            if Sentry.initialized?
-              @span = Sentry.get_current_scope.get_span
+            if Sentry.initialized? && (@span = Sentry.get_current_scope.get_span)
               span_name = @monitor.name_for(@keyword, @object)
               @span.start_child(op: span_name)
             end

spec/graphql/tracing/sentry_trace_spec.rb

@@ -47,6 +47,13 @@ class SchemaWithTransactionName < GraphQL::Schema
     assert res.context[:other_trace_ran]
   end
 
+  it "handles cases when Sentry has no current span" do
+    Sentry.use_nil_span = true
+    assert SentryTraceTest::SchemaWithoutTransactionName.execute("{ int }")
+  ensure
+    Sentry.use_nil_span = false
+  end
+
   describe "When Sentry is not configured" do
     it "does not initialize any spans" do
       Sentry.stub(:initialized?, false) do

spec/support/sentry.rb

@@ -11,6 +11,10 @@ module Sentry
   SPAN_DESCRIPTIONS = []
   TRANSACTION_NAMES = []
 
+  class << self
+    attr_accessor :use_nil_span
+  end
+
   def self.initialized?
     true
   end
@@ -24,7 +28,7 @@ def self.get_current_scope
   end
 
   def self.get_span
-    DummySpan
+    use_nil_span ? nil : DummySpan
   end
 
   def self.with_child_span(**args, &block)