graphql 2.4.8 → 2.4.10

data/lib/graphql/tracing/trace.rb

@@ -8,7 +8,7 @@ module GraphQL
     # "Trace modes" are subclasses of this with custom tracing modules mixed in.
     #
     # A trace module may implement any of the methods on `Trace`, being sure to call `super`
-    # to continue any tracing hooks and call the actual runtime behavior. See {GraphQL::Backtrace::Trace} for example.
+    # to continue any tracing hooks and call the actual runtime behavior.
     #
     class Trace
       # @param multiplex [GraphQL::Execution::Multiplex, nil]
@@ -23,6 +23,14 @@ module GraphQL
         yield
       end
 
+      # @param query_str [String]
+      # @return [void]
+      def begin_parse(query_str); end;
+      # @param query_str [String]
+      # @return [void]
+      def end_parse(query_str); end;
+      # @param query_string [String]
+      # @return [void]
       def parse(query_string:)
         yield
       end
@@ -31,6 +39,22 @@ module GraphQL
         yield
       end
 
+      def begin_validate(query, validate)
+      end
+
+      def end_validate(query, validate, errors)
+      end
+
+      # @param multiplex [GraphQL::Execution::Multiplex]
+      # @param analyzers [Array<Class>]
+      # @return [void]
+      def begin_analyze_multiplex(multiplex, analyzers); end
+      # @param multiplex [GraphQL::Execution::Multiplex]
+      # @param analyzers [Array<Class>]
+      # @return [void]
+      def end_analyze_multiplex(multiplex, analyzers); end
+      # @param multiplex [GraphQL::Execution::Multiplex]
+      # @return [void]
       def analyze_multiplex(multiplex:)
         yield
       end
@@ -39,6 +63,20 @@ module GraphQL
         yield
       end
 
+      # This is the first event in the tracing lifecycle.
+      # Every Query is technically run _inside_ a {GraphQL::Multiplex}.
+      # @param multiplex [GraphQL::Execution::Multiplex]
+      # @return [void]
+      def begin_execute_multiplex(multiplex); end;
+
+      # This is the last event of the tracing lifecycle.
+      # @param multiplex [GraphQL::Execution::Multiplex]
+      # @return [void]
+      def end_execute_multiplex(multiplex); end;
+
+      # This wraps an entire `.execute` call.
+      # @param multiplex [GraphQL::Execution::Multiplex]
+      # @return [void]
       def execute_multiplex(multiplex:)
         yield
       end
@@ -51,6 +89,20 @@ module GraphQL
         yield
       end
 
+      # GraphQL is about to resolve this field
+      # @param field [GraphQL::Schema::Field]
+      # @param object [GraphQL::Schema::Object]
+      # @param arguments [Hash]
+      # @param query [GraphQL::Query]
+      def begin_execute_field(field, object, arguments, query); end
+      # GraphQL just finished resolving this field
+      # @param field [GraphQL::Schema::Field]
+      # @param object [GraphQL::Schema::Object]
+      # @param arguments [Hash]
+      # @param query [GraphQL::Query]
+      # @param result [Object]
+      def end_execute_field(field, object, arguments, query, result); end
+
       def execute_field(field:, query:, ast_node:, arguments:, object:)
         yield
       end
@@ -63,6 +115,22 @@ module GraphQL
         yield
       end
 
+      # A call to `.authorized?` is starting
+      # @param type [Class<GraphQL::Schema::Object>]
+      # @param object [Object]
+      # @param context [GraphQL::Query::Context]
+      # @return [void]
+      def begin_authorized(type, object, context)
+      end
+      # A call to `.authorized?` just finished
+      # @param type [Class<GraphQL::Schema::Object>]
+      # @param object [Object]
+      # @param context [GraphQL::Query::Context]
+      # @param authorized_result [Boolean]
+      # @return [void]
+      def end_authorized(type, object, context, authorized_result)
+      end
+
       def authorized_lazy(query:, type:, object:)
         yield
       end
@@ -74,6 +142,62 @@ module GraphQL
       def resolve_type_lazy(query:, type:, object:)
         yield
       end
+
+      # A call to `.resolve_type` is starting
+      # @param type [Class<GraphQL::Schema::Union>, Module<GraphQL::Schema::Interface>]
+      # @param value [Object]
+      # @param context [GraphQL::Query::Context]
+      # @return [void]
+      def begin_resolve_type(type, value, context)
+      end
+
+      # A call to `.resolve_type` just ended
+      # @param type [Class<GraphQL::Schema::Union>, Module<GraphQL::Schema::Interface>]
+      # @param value [Object]
+      # @param context [GraphQL::Query::Context]
+      # @param resolved_type [Class<GraphQL::Schema::Object>]
+      # @return [void]
+      def end_resolve_type(type, value, context, resolved_type)
+      end
+
+      # A dataloader run is starting
+      # @param dataloader [GraphQL::Dataloader]
+      # @return [void]
+      def begin_dataloader(dataloader); end
+      # A dataloader run has ended
+      # @param dataloder [GraphQL::Dataloader]
+      # @return [void]
+      def end_dataloader(dataloader); end
+
+      # A source with pending keys is about to fetch
+      # @param source [GraphQL::Dataloader::Source]
+      # @return [void]
+      def begin_dataloader_source(source); end
+      # A fetch call has just ended
+      # @param source [GraphQL::Dataloader::Source]
+      # @return [void]
+      def end_dataloader_source(source); end
+
+      # Called when Dataloader spins up a new fiber for GraphQL execution
+      # @param jobs [Array<#call>] Execution steps to run
+      # @return [void]
+      def dataloader_spawn_execution_fiber(jobs); end
+      # Called when Dataloader spins up a new fiber for fetching data
+      # @param pending_sources [GraphQL::Dataloader::Source] Instances with pending keys
+      # @return [void]
+      def dataloader_spawn_source_fiber(pending_sources); end
+      # Called when an execution or source fiber terminates
+      # @return [void]
+      def dataloader_fiber_exit; end
+
+      # Called when a Dataloader fiber is paused to wait for data
+      # @param source [GraphQL::Dataloader::Source] The Source whose `load` call initiated this `yield`
+      # @return [void]
+      def dataloader_fiber_yield(source); end
+      # Called when a Dataloader fiber is resumed because data has been loaded
+      # @param source [GraphQL::Dataloader::Source] The Source whose `load` call previously caused this Fiber to wait
+      # @return [void]
+      def dataloader_fiber_resume(source); end
     end
   end
 end

data/lib/graphql/tracing.rb

@@ -31,6 +31,7 @@ module GraphQL
     autoload :ScoutTrace, "graphql/tracing/scout_trace"
     autoload :StatsdTrace, "graphql/tracing/statsd_trace"
     autoload :PrometheusTrace, "graphql/tracing/prometheus_trace"
+    autoload :PerfettoTrace, "graphql/tracing/perfetto_trace"
 
     # Objects may include traceable to gain a `.trace(...)` method.
     # The object must have a `@tracers` ivar of type `Array<<#trace(k, d, &b)>>`.

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "2.4.8"
+  VERSION = "2.4.10"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.4.8
+  version: 2.4.10
 platform: ruby
 authors:
 - Robert Mosolgo
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -38,6 +37,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +79,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: google-protobuf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: graphql-batch
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +205,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: undercover
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pronto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pronto-undercover
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +289,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jekyll-sass-converter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +359,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -330,14 +455,13 @@ files:
 - lib/graphql/analysis_error.rb
 - lib/graphql/autoload.rb
 - lib/graphql/backtrace.rb
-- lib/graphql/backtrace/inspect_result.rb
 - lib/graphql/backtrace/table.rb
-- lib/graphql/backtrace/trace.rb
 - lib/graphql/backtrace/traced_error.rb
-- lib/graphql/backtrace/tracer.rb
 - lib/graphql/coercion_error.rb
 - lib/graphql/current.rb
 - lib/graphql/dataloader.rb
+- lib/graphql/dataloader/active_record_association_source.rb
+- lib/graphql/dataloader/active_record_source.rb
 - lib/graphql/dataloader/async_dataloader.rb
 - lib/graphql/dataloader/null_dataloader.rb
 - lib/graphql/dataloader/request.rb
@@ -466,6 +590,7 @@ files:
 - lib/graphql/schema/member/graphql_type_names.rb
 - lib/graphql/schema/member/has_arguments.rb
 - lib/graphql/schema/member/has_ast_node.rb
+- lib/graphql/schema/member/has_dataloader.rb
 - lib/graphql/schema/member/has_deprecation_reason.rb
 - lib/graphql/schema/member/has_directives.rb
 - lib/graphql/schema/member/has_fields.rb
@@ -479,7 +604,6 @@ files:
 - lib/graphql/schema/member/validates_input.rb
 - lib/graphql/schema/mutation.rb
 - lib/graphql/schema/non_null.rb
-- lib/graphql/schema/null_mask.rb
 - lib/graphql/schema/object.rb
 - lib/graphql/schema/printer.rb
 - lib/graphql/schema/relay_classic_mutation.rb
@@ -604,6 +728,9 @@ files:
 - lib/graphql/tracing/notifications_trace.rb
 - lib/graphql/tracing/notifications_tracing.rb
 - lib/graphql/tracing/null_trace.rb
+- lib/graphql/tracing/perfetto_trace.rb
+- lib/graphql/tracing/perfetto_trace/trace.proto
+- lib/graphql/tracing/perfetto_trace/trace_pb.rb
 - lib/graphql/tracing/platform_trace.rb
 - lib/graphql/tracing/platform_tracing.rb
 - lib/graphql/tracing/prometheus_trace.rb
@@ -654,7 +781,6 @@ metadata:
   bug_tracker_uri: https://github.com/rmosolgo/graphql-ruby/issues
   mailing_list_uri: https://buttondown.email/graphql-ruby
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -669,8 +795,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.12
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: A GraphQL language and runtime for Ruby
 test_files: []

data/lib/graphql/backtrace/inspect_result.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-module GraphQL
-  class Backtrace
-    module InspectResult
-      module_function
-
-      def inspect_result(obj)
-        case obj
-        when Hash
-          "{" +
-            obj.map do |key, val|
-              "#{key}: #{inspect_truncated(val)}"
-            end.join(", ") +
-            "}"
-        when Array
-          "[" +
-            obj.map { |v| inspect_truncated(v) }.join(", ") +
-            "]"
-        else
-          inspect_truncated(obj)
-        end
-      end
-
-      def inspect_truncated(obj)
-        case obj
-        when Hash
-          "{...}"
-        when Array
-          "[...]"
-        when GraphQL::Execution::Lazy
-          "(unresolved)"
-        else
-          "#{obj.inspect}"
-        end
-      end
-    end
-  end
-end

data/lib/graphql/backtrace/trace.rb

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-module GraphQL
-  class Backtrace
-    module Trace
-      def initialize(*args, **kwargs, &block)
-        @__backtrace_contexts = {}
-        @__backtrace_last_context = nil
-        super
-      end
-
-      def validate(query:, validate:)
-        if query.multiplex
-          push_query_backtrace_context(query)
-        end
-        super
-      end
-
-      def analyze_query(query:)
-        if query.multiplex # missing for stand-alone static validation
-          push_query_backtrace_context(query)
-        end
-        super
-      end
-
-      def execute_query(query:)
-        push_query_backtrace_context(query)
-        super
-      end
-
-      def execute_query_lazy(query:, multiplex:)
-        query ||= multiplex.queries.first
-        push_query_backtrace_context(query)
-        super
-      end
-
-      def execute_field(field:, query:, ast_node:, arguments:, object:)
-        push_field_backtrace_context(field, query, ast_node, arguments, object)
-        super
-      end
-
-      def execute_field_lazy(field:, query:, ast_node:, arguments:, object:)
-        push_field_backtrace_context(field, query, ast_node, arguments, object)
-        super
-      end
-
-      def execute_multiplex(multiplex:)
-        super
-      rescue StandardError => err
-        # This is an unhandled error from execution,
-        # Re-raise it with a GraphQL trace.
-        potential_context = @__backtrace_last_context
-        if potential_context.is_a?(GraphQL::Query::Context) ||
-            potential_context.is_a?(Backtrace::Frame)
-          raise TracedError.new(err, potential_context)
-        else
-          raise
-        end
-      end
-
-      private
-
-      def push_query_backtrace_context(query)
-        push_data = query
-        push_key = []
-        @__backtrace_contexts[push_key] = push_data
-        @__backtrace_last_context = push_data
-      end
-
-      def push_field_backtrace_context(field, query, ast_node, arguments, object)
-        push_key = query.context[:current_path]
-        push_storage = @__backtrace_contexts
-        parent_frame = push_storage[push_key[0..-2]]
-
-        if parent_frame.is_a?(GraphQL::Query)
-          parent_frame = parent_frame.context
-        end
-
-        push_data = Frame.new(
-          query: query,
-          path: push_key,
-          ast_node: ast_node,
-          field: field,
-          object: object,
-          arguments: arguments,
-          parent_frame: parent_frame,
-        )
-        push_storage[push_key] = push_data
-        @__backtrace_last_context = push_data
-      end
-
-    end
-  end
-end

data/lib/graphql/backtrace/tracer.rb

@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-module GraphQL
-  class Backtrace
-    # TODO this is not fiber-friendly
-    module Tracer
-      module_function
-
-      # Implement the {GraphQL::Tracing} API.
-      def trace(key, metadata)
-        case key
-        when "lex", "parse"
-          # No context here, don't have a query yet
-          nil
-        when "execute_multiplex", "analyze_multiplex"
-          # No query context yet
-          nil
-        when "validate", "analyze_query", "execute_query", "execute_query_lazy"
-          push_key = []
-          if (query = metadata[:query]) || ((queries = metadata[:queries]) && (query = queries.first))
-            push_data = query
-            multiplex = query.multiplex
-          elsif (multiplex = metadata[:multiplex])
-            push_data = multiplex.queries.first
-          end
-        when "execute_field", "execute_field_lazy"
-          query = metadata[:query]
-          multiplex = query.multiplex
-          push_key = query.context[:current_path]
-          parent_frame = multiplex.context[:graphql_backtrace_contexts][push_key[0..-2]]
-
-          if parent_frame.is_a?(GraphQL::Query)
-            parent_frame = parent_frame.context
-          end
-
-          push_data = Frame.new(
-            query: query,
-            path: push_key,
-            ast_node: metadata[:ast_node],
-            field: metadata[:field],
-            object: metadata[:object],
-            arguments: metadata[:arguments],
-            parent_frame: parent_frame,
-          )
-        else
-          # Custom key, no backtrace data for this
-          nil
-        end
-
-        if push_data && multiplex
-          push_storage = multiplex.context[:graphql_backtrace_contexts] ||= {}
-          push_storage[push_key] = push_data
-          multiplex.context[:last_graphql_backtrace_context] = push_data
-        end
-
-        if key == "execute_multiplex"
-          multiplex_context = metadata[:multiplex].context
-          begin
-            yield
-          rescue StandardError => err
-            # This is an unhandled error from execution,
-            # Re-raise it with a GraphQL trace.
-            potential_context = multiplex_context[:last_graphql_backtrace_context]
-
-            if potential_context.is_a?(GraphQL::Query::Context) ||
-                potential_context.is_a?(Backtrace::Frame)
-              raise TracedError.new(err, potential_context)
-            else
-              raise
-            end
-          ensure
-            multiplex_context.delete(:graphql_backtrace_contexts)
-            multiplex_context.delete(:last_graphql_backtrace_context)
-          end
-        else
-          yield
-        end
-      end
-    end
-  end
-end

data/lib/graphql/schema/null_mask.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-module GraphQL
-  class Schema
-    # @api private
-    module NullMask
-      def self.call(member, ctx)
-        false
-      end
-    end
-  end
-end