Migrate tests

Author: rmosolgo

spec/graphql/execution/interpreter_spec.rb

@@ -306,20 +306,20 @@ def self.trace(event, data)
       end
       tracer EnsureArgsAreObject
 
-      class EnsureThreadCleanedUp
-        def self.before_multiplex(_multiplex); end
-        def self.after_multiplex(multiplex)
+      module EnsureThreadCleanedUp
+        def execute_multiplex(multiplex:)
+          res = super
           runtime_info = Thread.current[:__graphql_runtime_info]
           if !runtime_info.nil? && runtime_info != {}
             if !multiplex.context[:allow_pending_thread_state]
               # `nestedQuery` can allow this
               raise "Query did not clean up runtime state, found: #{runtime_info.inspect}"
             end
           end
+          res
         end
       end
-
-      instrument :multiplex, EnsureThreadCleanedUp
+      trace_with(EnsureThreadCleanedUp)
     end
   end
 

spec/graphql/execution/lookahead_spec.rb

@@ -89,18 +89,16 @@ def species(id:)
       end
     end
 
-    class LookaheadInstrumenter
-      def self.before_query(query)
+    module LookaheadInstrumenter
+      def execute_query(query:)
         query.context[:root_lookahead_selections] = query.lookahead.selections
-      end
-
-      def self.after_query(q)
+        super
       end
     end
 
     class Schema < GraphQL::Schema
       query(Query)
-      instrument :query, LookaheadInstrumenter
+      trace_with LookaheadInstrumenter
     end
 
     class AlwaysVisibleSchema < Schema

spec/graphql/schema_spec.rb

@@ -238,13 +238,12 @@ def trace(_key, data)
       end
     end
 
-    class NoOpInstrumentation
-      def before_query(query)
-        query.context[:no_op_instrumentation_ran_before_query] = true
-      end
-
-      def after_query(query)
-        query.context[:no_op_instrumentation_ran_after_query] = true
+    module NoOpTrace
+      def execute_query(query:)
+        query.context[:no_op_trace_ran_before_query] = true
+        super
+      ensure
+        query.context[:no_op_trace_ran_after_query] = true
       end
     end
 
@@ -265,7 +264,7 @@ def result
 
     module PluginWithInstrumentationTracingAndAnalyzer
       def self.use(schema_defn)
-        schema_defn.instrument :query, NoOpInstrumentation.new
+        schema_defn.trace_with(NoOpTrace)
         schema_defn.tracer NoOpTracer.new
         schema_defn.query_analyzer NoOpAnalyzer
       end
@@ -291,8 +290,8 @@ def foobar; 1337; end
         res = query.result
         assert res.key?("data")
 
-        assert_equal true, query.context[:no_op_instrumentation_ran_before_query]
-        assert_equal true, query.context[:no_op_instrumentation_ran_after_query]
+        assert_equal true, query.context[:no_op_trace_ran_before_query]
+        assert_equal true, query.context[:no_op_trace_ran_after_query]
         assert_equal true, query.context[:no_op_tracer_ran]
         assert_equal true, query.context[:no_op_analyzer_ran_initialize]
         assert_equal true, query.context[:no_op_analyzer_ran_on_leave_field]
@@ -318,8 +317,8 @@ def foobar; 1337; end
         res = query.result
         assert res.key?("data")
 
-        assert_equal true, query.context[:no_op_instrumentation_ran_before_query]
-        assert_equal true, query.context[:no_op_instrumentation_ran_after_query]
+        assert_equal true, query.context[:no_op_trace_ran_before_query]
+        assert_equal true, query.context[:no_op_trace_ran_after_query]
         assert_equal true, query.context[:no_op_tracer_ran]
         assert_equal true, query.context[:no_op_analyzer_ran_initialize]
         assert_equal true, query.context[:no_op_analyzer_ran_on_leave_field]