Merge pull request #4830 from rmosolgo/sentry-trace-fix

Fix sentry trace super calls
rmosolgo · Feb 7, 2024 · 8ece5c3 · 8ece5c3
2 parents 35b7851 + 19dbad8
commit 8ece5c3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/graphql/tracing/sentry_trace.rb b/lib/graphql/tracing/sentry_trace.rb
@@ -16,8 +16,8 @@ module SentryTrace
         "execute_query_lazy" => "graphql.execute"
       }.each do |trace_method, platform_key|
         module_eval <<-RUBY, __FILE__, __LINE__
-        def #{trace_method}(**data, &block)
-          instrument_execution("#{platform_key}", "#{trace_method}", data, &block)
+        def #{trace_method}(**data)
+          instrument_execution("#{platform_key}", "#{trace_method}", data) { super }
         end
         RUBY
       end

diff --git a/spec/graphql/tracing/sentry_trace_spec.rb b/spec/graphql/tracing/sentry_trace_spec.rb
@@ -22,13 +22,25 @@ def thing; :thing; end
 
     query(Query)
 
+    module OtherTrace
+      def execute_query(query:)
+        query.context[:other_trace_ran] = true
+        super
+      end
+    end
+    trace_with OtherTrace
     trace_with GraphQL::Tracing::SentryTrace
   end
 
   before do
     Sentry.clear_all
   end
 
+  it "works with other trace modules" do
+    res = SentryTraceTestSchema.execute("{ int }")
+    assert res.context[:other_trace_ran]
+  end
+
   describe "When Sentry is not configured" do
     it "does not initialize any spans" do
       Sentry.stub(:initialized?, false) do