graphql 2.0.20 → 2.0.22

data/lib/graphql/tracing.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
+require "graphql/tracing/trace"
+require "graphql/tracing/legacy_trace"
+
 # Legacy tracing:
 require "graphql/tracing/active_support_notifications_tracing"
 require "graphql/tracing/platform_tracing"
@@ -11,6 +14,7 @@ require "graphql/tracing/statsd_tracing"
 require "graphql/tracing/prometheus_tracing"
 
 # New Tracing:
+require "graphql/tracing/active_support_notifications_trace"
 require "graphql/tracing/platform_trace"
 require "graphql/tracing/appoptics_trace"
 require "graphql/tracing/appsignal_trace"
@@ -26,131 +30,8 @@ end
 
 module GraphQL
   module Tracing
-    class Trace
-      # @param multiplex [GraphQL::Execution::Multiplex, nil]
-      # @param query [GraphQL::Query, nil]
-      def initialize(multiplex: nil, query: nil, **_options)
-        @multiplex = multiplex
-        @query = query
-      end
-
-      def lex(query_string:)
-        yield
-      end
-
-      def parse(query_string:)
-        yield
-      end
-
-      def validate(query:, validate:)
-        yield
-      end
-
-      def analyze_multiplex(multiplex:)
-        yield
-      end
-
-      def analyze_query(query:)
-        yield
-      end
-
-      def execute_multiplex(multiplex:)
-        yield
-      end
-
-      def execute_query(query:)
-        yield
-      end
-
-      def execute_query_lazy(query:, multiplex:)
-        yield
-      end
-
-      def execute_field(field:, query:, ast_node:, arguments:, object:)
-        yield
-      end
-
-      def execute_field_lazy(field:, query:, ast_node:, arguments:, object:)
-        yield
-      end
-
-      def authorized(query:, type:, object:)
-        yield
-      end
-
-      def authorized_lazy(query:, type:, object:)
-        yield
-      end
-
-      def resolve_type(query:, type:, object:)
-        yield
-      end
-
-      def resolve_type_lazy(query:, type:, object:)
-        yield
-      end
-    end
-
     NullTrace = Trace.new
 
-    class LegacyTrace < Trace
-      def lex(query_string:, &block)
-        (@multiplex || @query).trace("lex", { query_string: query_string }, &block)
-      end
-
-      def parse(query_string:, &block)
-        (@multiplex || @query).trace("parse", { query_string: query_string }, &block)
-      end
-
-      def validate(query:, validate:, &block)
-        query.trace("validate", { validate: validate, query: query }, &block)
-      end
-
-      def analyze_multiplex(multiplex:, &block)
-        multiplex.trace("analyze_multiplex", { multiplex: multiplex }, &block)
-      end
-
-      def analyze_query(query:, &block)
-        query.trace("analyze_query", { query: query }, &block)
-      end
-
-      def execute_multiplex(multiplex:, &block)
-        multiplex.trace("execute_multiplex", { multiplex: multiplex }, &block)
-      end
-
-      def execute_query(query:, &block)
-        query.trace("execute_query", { query: query }, &block)
-      end
-
-      def execute_query_lazy(query:, multiplex:, &block)
-        multiplex.trace("execute_query_lazy", { multiplex: multiplex, query: query }, &block)
-      end
-
-      def execute_field(field:, query:, ast_node:, arguments:, object:, &block)
-        query.trace("execute_field", { field: field, query: query, ast_node: ast_node, arguments: arguments, object: object, owner: field.owner, path: query.context[:current_path] }, &block)
-      end
-
-      def execute_field_lazy(field:, query:, ast_node:, arguments:, object:, &block)
-        query.trace("execute_field_lazy", { field: field, query: query, ast_node: ast_node, arguments: arguments, object: object, owner: field.owner, path: query.context[:current_path] }, &block)
-      end
-
-      def authorized(query:, type:, object:, &block)
-        query.trace("authorized", { context: query.context, type: type, object: object, path: query.context[:current_path] }, &block)
-      end
-
-      def authorized_lazy(query:, type:, object:, &block)
-        query.trace("authorized_lazy", { context: query.context, type: type, object: object, path: query.context[:current_path] }, &block)
-      end
-
-      def resolve_type(query:, type:, object:, &block)
-        query.trace("resolve_type", { context: query.context, type: type, object: object, path: query.context[:current_path] }, &block)
-      end
-
-      def resolve_type_lazy(query:, type:, object:, &block)
-        query.trace("resolve_type_lazy", { context: query.context, type: type, object: object, path: query.context[:current_path] }, &block)
-      end
-    end
-
     # Objects may include traceable to gain a `.trace(...)` method.
     # The object must have a `@tracers` ivar of type `Array<<#trace(k, d, &b)>>`.
     # @api private

data/lib/graphql/version.rb

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

data/lib/graphql.rb

@@ -69,6 +69,10 @@ This is probably a bug in GraphQL-Ruby, please report this error on GitHub: http
 
   NOT_CONFIGURED = Object.new
   private_constant :NOT_CONFIGURED
+  module EmptyObjects
+    EMPTY_HASH = {}.freeze
+    EMPTY_ARRAY = [].freeze
+  end
 end
 
 # Order matters for these:

data/readme.md

@@ -44,6 +44,6 @@ I also sell [GraphQL::Pro](https://graphql.pro) which provides several features
 
 ## Getting Involved
 
-- __Say hi & ask questions__ in the #graphql-ruby channel on [Discord](https://discord.com/invite/xud7bH9) or [on Twitter](https://twitter.com/rmosolgo)!
+- __Say hi & ask questions__ in the #graphql-ruby channel on [Discord](https://discord.com/invite/xud7bH9).
 - __Report bugs__ by posting a description, full stack trace, and all relevant code in a  [GitHub issue](https://github.com/rmosolgo/graphql-ruby/issues).
 - __Start hacking__ with the [Development guide](https://graphql-ruby.org/development).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.0.20
+  version: 2.0.22
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -303,6 +303,7 @@ files:
 - 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
@@ -555,6 +556,7 @@ files:
 - lib/graphql/tracing/appsignal_tracing.rb
 - lib/graphql/tracing/data_dog_trace.rb
 - lib/graphql/tracing/data_dog_tracing.rb
+- lib/graphql/tracing/legacy_trace.rb
 - lib/graphql/tracing/new_relic_trace.rb
 - lib/graphql/tracing/new_relic_tracing.rb
 - lib/graphql/tracing/notifications_trace.rb
@@ -568,6 +570,7 @@ files:
 - lib/graphql/tracing/scout_tracing.rb
 - lib/graphql/tracing/statsd_trace.rb
 - lib/graphql/tracing/statsd_tracing.rb
+- lib/graphql/tracing/trace.rb
 - lib/graphql/type_kinds.rb
 - lib/graphql/types.rb
 - lib/graphql/types/big_int.rb
@@ -619,7 +622,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: A GraphQL language and runtime for Ruby