graphql 2.4.16 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de438ab024dd0f9529cca84745fb63e84189d7e85eb447cfaba1b34f1d18e14f
-  data.tar.gz: bbdf79794313f06b060ade4125e90bf66ec70ab243e7a27033ad553d576720f1
+  metadata.gz: a82f63cf89ed829ecce70f0440ffa72705b0600433d6c63589b77c75139bf50a
+  data.tar.gz: dc821060ecb316ece718cfe00173f2c9fdca6195deb5850cf056b71bcfc85855
 SHA512:
-  metadata.gz: d2d1b6a04aadd7133ecf3095cb8440d581e461027ac97b69dd4bba5c1839f796eb68d6b2062665ddd42aa52be26328460a2ef81d82eb66c2f39719b2ee2b986d
-  data.tar.gz: 2f852d8d9c11339fd0de30badffea53f2b79eaa34484e1e833ff60a899ba2ff617e9b4348729b687cbd02629049bc99812c258d368831017d76e566fb770cc62
+  metadata.gz: 81aa380e6405acc499fd9cbefddefa9a658928ff2fbde220fbcf0546012280ce15e4d57578fd288819bfe5b80ad74afdce063411458246a3ea4ad2731ce78acb
+  data.tar.gz: 59cfad46873d743dc0a698a628037be3ec6c2b0b8ed0e533204c42a2809327095df05cca019f2457d1ec018f7625f89a513008dd552d935f0e452bc19a6691e2

data/lib/graphql/execution/interpreter.rb

@@ -39,7 +39,6 @@ module GraphQL
           multiplex = Execution::Multiplex.new(schema: schema, queries: queries, context: context, max_complexity: max_complexity)
           trace = multiplex.current_trace
           Fiber[:__graphql_current_multiplex] = multiplex
-          trace.begin_execute_multiplex(multiplex)
           trace.execute_multiplex(multiplex: multiplex) do
             schema = multiplex.schema
             queries = multiplex.queries
@@ -156,8 +155,6 @@ module GraphQL
               }
             end
           end
-        ensure
-          trace&.end_execute_multiplex(multiplex)
         end
       end
 

data/lib/graphql/query.rb

@@ -442,7 +442,6 @@ module GraphQL
       @warden ||= @schema.warden_class.new(schema: @schema, context: @context)
       parse_error = nil
       @document ||= begin
-        current_trace.begin_parse(query_string)
         if query_string
           GraphQL.parse(query_string, trace: self.current_trace, max_tokens: @schema.max_query_string_tokens)
         end
@@ -450,8 +449,6 @@ module GraphQL
         parse_error = err
         @schema.parse_error(err, @context)
         nil
-      ensure
-        current_trace.end_parse(query_string)
       end
 
       @fragments = {}

data/lib/graphql/static_validation/all_rules.rb

@@ -34,7 +34,7 @@ module GraphQL
       GraphQL::StaticValidation::VariableUsagesAreAllowed,
       GraphQL::StaticValidation::MutationRootExists,
       GraphQL::StaticValidation::QueryRootExists,
-      GraphQL::StaticValidation::SubscriptionRootExists,
+      GraphQL::StaticValidation::SubscriptionRootExistsAndSingleSubscriptionSelection,
       GraphQL::StaticValidation::InputObjectNamesAreUnique,
       GraphQL::StaticValidation::OneOfInputObjectsAreValid,
     ]

data/lib/graphql/static_validation/rules/not_single_subscription_error.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+module GraphQL
+  module StaticValidation
+    class NotSingleSubscriptionError < StaticValidation::Error
+      def initialize(message, path: nil, nodes: [])
+        super(message, path: path, nodes: nodes)
+      end
+
+      # A hash representation of this Message
+      def to_h
+        extensions = {
+          "code" => code,
+        }
+
+        super.merge({
+          "extensions" => extensions
+        })
+      end
+
+      def code
+        "notSingleSubscription"
+      end
+    end
+  end
+end

data/lib/graphql/static_validation/rules/subscription_root_exists_and_single_subscription_selection.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+module GraphQL
+  module StaticValidation
+    module SubscriptionRootExistsAndSingleSubscriptionSelection
+      def on_operation_definition(node, parent)
+        if node.operation_type == "subscription"
+          if context.types.subscription_root.nil?
+            add_error(GraphQL::StaticValidation::SubscriptionRootExistsError.new(
+              'Schema is not configured for subscriptions',
+              nodes: node
+            ))
+          elsif node.selections.size != 1
+            add_error(GraphQL::StaticValidation::NotSingleSubscriptionError.new(
+              'A subscription operation may only have one selection',
+              nodes: node,
+            ))
+          else
+            super
+          end
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/graphql/tracing/active_support_notifications_trace.rb

@@ -10,6 +10,13 @@ module GraphQL
     #   class MySchema < GraphQL::Schema
     #     trace_with(GraphQL::Tracing::ActiveSupportNotificationsTrace)
     #   end
+    #
+    # @example Subscribing to GraphQL events with ActiveSupport::Notifications
+    #   ActiveSupport::Notifications.subscribe(/graphql/) do |event|
+    #     pp event.name
+    #     pp event.payload
+    #   end
+    #
     module ActiveSupportNotificationsTrace
       include NotificationsTrace
       def initialize(engine: ActiveSupport::Notifications, **rest)

data/lib/graphql/tracing/appoptics_tracing.rb

@@ -22,6 +22,11 @@ module GraphQL
       # These GraphQL events will show up as 'graphql.execute' spans
       EXEC_KEYS = ['execute_multiplex', 'execute_query', 'execute_query_lazy'].freeze
 
+      def initialize(...)
+        warn "GraphQL::Tracing::AppOptics tracing is deprecated; update to SolarWindsAPM instead, which uses OpenTelemetry."
+        super
+      end
+
       # During auto-instrumentation this version of AppOpticsTracing is compared
       # with the version provided in the appoptics_apm gem, so that the newer
       # version of the class can be used

data/lib/graphql/tracing/appsignal_trace.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
-
-require "graphql/tracing/platform_trace"
+require "graphql/tracing/monitor_trace"
 
 module GraphQL
   module Tracing
@@ -10,80 +9,46 @@ module GraphQL
     #   class MySchema < GraphQL::Schema
     #     trace_with GraphQL::Tracing::AppsignalTrace
     #   end
+    AppsignalTrace = MonitorTrace.create_module("appsignal")
     module AppsignalTrace
-      include PlatformTrace
-
       # @param set_action_name [Boolean] If true, the GraphQL operation name will be used as the transaction name.
       #   This is not advised if you run more than one query per HTTP request, for example, with `graphql-client` or multiplexing.
       #   It can also be specified per-query with `context[:set_appsignal_action_name]`.
       def initialize(set_action_name: false, **rest)
-        @set_action_name = set_action_name
+        rest[:set_transaction_name] ||= set_action_name
+        setup_appsignal_monitor(**rest)
         super
       end
 
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
-
-      {
-        "lex" => "lex.graphql",
-        "parse" => "parse.graphql",
-        "validate" => "validate.graphql",
-        "analyze_query" => "analyze.graphql",
-        "analyze_multiplex" => "analyze.graphql",
-        "execute_multiplex" => "execute.graphql",
-        "execute_query" => "execute.graphql",
-        "execute_query_lazy" => "execute.graphql",
-      }.each do |trace_method, platform_key|
-        module_eval <<-RUBY, __FILE__, __LINE__
-          def #{trace_method}(**data)
-            #{
-              if trace_method == "execute_query"
-                <<-RUBY
-                set_this_txn_name =  data[:query].context[:set_appsignal_action_name]
-                if set_this_txn_name == true || (set_this_txn_name.nil? && @set_action_name)
-                  Appsignal::Transaction.current.set_action(transaction_name(data[:query]))
-                end
-                RUBY
-              end
-            }
-
-            Appsignal.instrument("#{platform_key}") do
-              super
+      class AppsignalMonitor < MonitorTrace::Monitor
+        def instrument(keyword, object)
+          if keyword == :execute
+            query = object.queries.first
+            set_this_txn_name =  query.context[:set_appsignal_action_name]
+            if set_this_txn_name == true || (set_this_txn_name.nil? && @set_transaction_name)
+              Appsignal::Transaction.current.set_action(transaction_name(query))
             end
           end
-        RUBY
-      end
-
-      # rubocop:enable Development/NoEvalCop
-
-      def platform_execute_field(platform_key)
-        Appsignal.instrument(platform_key) do
-          yield
+          Appsignal.instrument(name_for(keyword, object)) do
+            yield
+          end
         end
-      end
 
-      def platform_authorized(platform_key)
-        Appsignal.instrument(platform_key) do
-          yield
-        end
-      end
+        include MonitorTrace::Monitor::GraphQLSuffixNames
+        class Event < GraphQL::Tracing::MonitorTrace::Monitor::Event
+          def start
+            Appsignal::Transaction.current.start_event
+          end
 
-      def platform_resolve_type(platform_key)
-        Appsignal.instrument(platform_key) do
-          yield
+          def finish
+            Appsignal::Transaction.current.finish_event(
+              @monitor.name_for(@keyword, @object),
+              "",
+              ""
+            )
+          end
         end
       end
-
-      def platform_field_key(field)
-        "#{field.owner.graphql_name}.#{field.graphql_name}.graphql"
-      end
-
-      def platform_authorized_key(type)
-        "#{type.graphql_name}.authorized.graphql"
-      end
-
-      def platform_resolve_type_key(type)
-        "#{type.graphql_name}.resolve_type.graphql"
-      end
     end
   end
 end

data/lib/graphql/tracing/data_dog_trace.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
-
-require "graphql/tracing/platform_trace"
+require "graphql/tracing/monitor_trace"
 
 module GraphQL
   module Tracing
@@ -9,186 +8,64 @@ module GraphQL
     #   class MySchema < GraphQL::Schema
     #     trace_with GraphQL::Tracing::DataDogTrace
     #   end
+    # @example Skipping `resolve_type` and `authorized` events
+    #   trace_with GraphQL::Tracing::DataDogTrace, trace_authorized: false, trace_resolve_type: false
+    DataDogTrace = MonitorTrace.create_module("datadog")
     module DataDogTrace
-      # @param tracer [#trace] Deprecated
-      # @param analytics_enabled [Boolean] Deprecated
-      # @param analytics_sample_rate [Float] Deprecated
-      def initialize(tracer: nil, analytics_enabled: false, analytics_sample_rate: 1.0, service: nil, **rest)
-        if tracer.nil?
-          tracer = defined?(Datadog::Tracing) ? Datadog::Tracing : Datadog.tracer
+      class DatadogMonitor < MonitorTrace::Monitor
+        def initialize(set_transaction_name:, service: nil, tracer: nil, **_rest)
+          super
+          if tracer.nil?
+            tracer = defined?(Datadog::Tracing) ? Datadog::Tracing : Datadog.tracer
+          end
+          @tracer = tracer
+          @service_name = service
+          @has_prepare_span = @trace.respond_to?(:prepare_span)
         end
-        @tracer = tracer
-
-        @analytics_enabled = analytics_enabled
-        @analytics_sample_rate = analytics_sample_rate
-
-        @service_name = service
-        @has_prepare_span = respond_to?(:prepare_span)
-        super
-      end
-
-      # rubocop:disable Development/NoEvalCop This eval takes static inputs at load-time
 
-      {
-        'lex' => 'lex.graphql',
-        'parse' => 'parse.graphql',
-        'validate' => 'validate.graphql',
-        'analyze_query' => 'analyze.graphql',
-        'analyze_multiplex' => 'analyze.graphql',
-        'execute_multiplex' => 'execute.graphql',
-        'execute_query' => 'execute.graphql',
-        'execute_query_lazy' => 'execute.graphql',
-      }.each do |trace_method, trace_key|
-        module_eval <<-RUBY, __FILE__, __LINE__
-          def #{trace_method}(**data)
-            @tracer.trace("#{trace_key}", service: @service_name, type: 'custom') do |span|
-                span.set_tag('component', 'graphql')
-                span.set_tag('operation', '#{trace_method}')
+        attr_reader :tracer, :service_name
 
-              #{
-                if trace_method == 'execute_multiplex'
-                  <<-RUBY
-                  operations = data[:multiplex].queries.map(&:selected_operation_name).join(', ')
-
-                  resource = if operations.empty?
-                    first_query = data[:multiplex].queries.first
-                    fallback_transaction_name(first_query && first_query.context)
-                  else
-                    operations
-                  end
-                  span.resource = resource if resource
-
-                  # [Deprecated] will be removed in the future
-                  span.set_metric('_dd1.sr.eausr', @analytics_sample_rate) if @analytics_enabled
-                  RUBY
-                elsif trace_method == 'execute_query'
-                  <<-RUBY
-                  span.set_tag(:selected_operation_name, data[:query].selected_operation_name)
-                  span.set_tag(:selected_operation_type, data[:query].selected_operation.operation_type)
-                  span.set_tag(:query_string, data[:query].query_string)
-                  RUBY
-                end
-              }
-              if @has_prepare_span
-                prepare_span("#{trace_method.sub("platform_", "")}", data, span)
+        def instrument(keyword, object)
+          trace_key = name_for(keyword, object)
+          @tracer.trace(trace_key, service: @service_name, type: 'custom') do |span|
+            span.set_tag('component', 'graphql')
+            op_name = keyword.respond_to?(:name) ? keyword.name : keyword.to_s
+            span.set_tag('operation', op_name)
+
+            if keyword == :execute
+              operations = object.queries.map(&:selected_operation_name).join(', ')
+              first_query = object.queries.first
+              resource = if operations.empty?
+                fallback_transaction_name(first_query && first_query.context)
+              else
+                operations
               end
-              super
-            end
-          end
-        RUBY
-      end
+              span.resource = resource if resource
 
-      # rubocop:enable Development/NoEvalCop
-
-      def execute_field_span(span_key, query, field, ast_node, arguments, object)
-        return_type = field.type.unwrap
-        trace_field = if return_type.kind.scalar? || return_type.kind.enum?
-          (field.trace.nil? && @trace_scalars) || field.trace
-        else
-          true
-        end
-        platform_key = if trace_field
-          @platform_key_cache[DataDogTrace].platform_field_key_cache[field]
-        else
-          nil
-        end
-        if platform_key && trace_field
-          @tracer.trace(platform_key, service: @service_name, type: 'custom') do |span|
-            span.set_tag('component', 'graphql')
-            span.set_tag('operation', span_key)
+              span.set_tag("selected_operation_name", first_query.selected_operation_name)
+              span.set_tag("selected_operation_type", first_query.selected_operation&.operation_type)
+              span.set_tag("query_string", first_query.query_string)
+            end
 
             if @has_prepare_span
-              prepare_span_data = { query: query, field: field, ast_node: ast_node, arguments: arguments, object: object }
-              prepare_span(span_key, prepare_span_data, span)
+              @trace.prepare_span(keyword, object, span)
             end
             yield
           end
-        else
-          yield
-        end
-      end
-      def execute_field(query:, field:, ast_node:, arguments:, object:)
-        execute_field_span("execute_field", query, field, ast_node, arguments, object) do
-          super(query: query, field: field, ast_node: ast_node, arguments: arguments, object: object)
-        end
-      end
-
-      def execute_field_lazy(query:, field:, ast_node:, arguments:, object:)
-        execute_field_span("execute_field_lazy", query, field, ast_node, arguments, object) do
-          super(query: query, field: field, ast_node: ast_node, arguments: arguments, object: object)
         end
-      end
 
-      def authorized(query:, type:, object:)
-        authorized_span("authorized", object, type, query) do
-          super(query: query, type: type, object: object)
-        end
-      end
-
-      def authorized_span(span_key, object, type, query)
-        platform_key = @platform_key_cache[DataDogTrace].platform_authorized_key_cache[type]
-        @tracer.trace(platform_key, service: @service_name, type: 'custom') do |span|
-          span.set_tag('component', 'graphql')
-          span.set_tag('operation', span_key)
-
-          if @has_prepare_span
-            prepare_span(span_key, {object: object, type: type, query: query}, span)
+        include MonitorTrace::Monitor::GraphQLSuffixNames
+        class Event < MonitorTrace::Monitor::Event
+          def start
+            name = @monitor.name_for(keyword, object)
+            @dd_span = @monitor.tracer.trace(name, service: @monitor.service_name, type: 'custom')
           end
-          yield
-        end
-      end
-
-      def authorized_lazy(object:, type:, query:)
-        authorized_span("authorized_lazy", object, type, query) do
-          super(query: query, type: type, object: object)
-        end
-      end
-
-      def resolve_type(object:, type:, query:)
-        resolve_type_span("resolve_type", object, type, query) do
-          super(object: object, query: query, type: type)
-        end
-      end
 
-      def resolve_type_lazy(object:, type:, query:)
-        resolve_type_span("resolve_type_lazy", object, type, query) do
-          super(object: object, query: query, type: type)
-        end
-      end
-
-      def resolve_type_span(span_key, object, type, query)
-        platform_key = @platform_key_cache[DataDogTrace].platform_resolve_type_key_cache[type]
-        @tracer.trace(platform_key, service: @service_name, type: 'custom') do |span|
-          span.set_tag('component', 'graphql')
-          span.set_tag('operation', span_key)
-
-          if @has_prepare_span
-            prepare_span(span_key, {object: object, type: type, query: query}, span)
+          def finish
+            @dd_span.finish
           end
-          yield
         end
       end
-
-      include PlatformTrace
-
-      # Implement this method in a subclass to apply custom tags to datadog spans
-      # @param key [String] The event being traced
-      # @param data [Hash] The runtime data for this event (@see GraphQL::Tracing for keys for each event)
-      # @param span [Datadog::Tracing::SpanOperation] The datadog span for this event
-      # def prepare_span(key, data, span)
-      # end
-
-      def platform_field_key(field)
-        field.path
-      end
-
-      def platform_authorized_key(type)
-        "#{type.graphql_name}.authorized"
-      end
-
-      def platform_resolve_type_key(type)
-        "#{type.graphql_name}.resolve_type"
-      end
     end
   end
 end