graphql 2.0.25 → 2.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 289b06689b36a3673c053d13d2ce0835a089e92db60e3e24e8af791fdd934d81
-  data.tar.gz: 3c5257c0732d0729b97ac92376427ccba26ef66397f9b9d07c18e9792ea03251
+  metadata.gz: b25908e65f82d9c17e76e1f38b874e882c124b7102dc7ae2cb3caf4e819aa370
+  data.tar.gz: d3933abea4a559db3767c6a1ea3f37401432a7fd67842df6c9bd3e28e4034a8d
 SHA512:
-  metadata.gz: 72ad503ed008aa168a63c1a40ac9e44dbb9b2d6a7871f1cd6191a692d6275506ce17f0df3135ae0a2ef95fe695a457d76239a2623f477cf7cd7f27cc124888c7
-  data.tar.gz: 90976b77a4230bf8a7d3fe5470deae70082e6caac1d3b30c799e958621cd2177283d0f83eb06128081e7e2179e33e718a1ba9353ab388fac83553e0988e7b4bc
+  metadata.gz: a8a85cb8ee54143b1ed00b6aa030479a1b48e164142e93e6b1e95f0f8cb44da36fcd1f3b53470f8edb783f43d469fd4e2dafa505217440832eb0d92165107239
+  data.tar.gz: dc61c951d84cc9199910145230cf55691d4fdb3a8f243b0e9f5dd9ee78c498a739de3d0bb72a65ade0cab07a9310a072dc7855ad5943425e778bd9b79f182e67

data/lib/graphql/tracing/data_dog_trace.rb

@@ -76,7 +76,7 @@ module GraphQL
         RUBY
       end
 
-      def execute_field(span_key = "execute_field", query:, field:, ast_node:, arguments:, object:)
+      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
@@ -99,18 +99,31 @@ module GraphQL
               prepare_span_data = { query: query, field: field, ast_node: ast_node, arguments: arguments, object: object }
               prepare_span(span_key, prepare_span_data, span)
             end
-            super(query: query, field: field, ast_node: ast_node, arguments: arguments, object: object)
+            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("execute_field_lazy", query: query, field: field, ast_node: ast_node, arguments: arguments, object: 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(object:, type:, query:, span_key: "authorized")
+      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) do |span|
           span.span_type = 'custom'
@@ -121,15 +134,29 @@ module GraphQL
           if @has_prepare_span
             prepare_span(span_key, {object: object, type: type, query: query}, span)
           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 authorized_lazy(**kwargs, &block)
-        authorized(span_key: "authorized_lazy", **kwargs, &block)
+      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(object:, type:, query:, span_key: "resolve_type")
+      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) do |span|
           span.span_type = 'custom'
@@ -140,14 +167,10 @@ module GraphQL
           if @has_prepare_span
             prepare_span(span_key, {object: object, type: type, query: query}, span)
           end
-          super(query: query, type: type, object: object)
+          yield
         end
       end
 
-      def resolve_type_lazy(**kwargs, &block)
-        resolve_type(span_key: "resolve_type_lazy", **kwargs, &block)
-      end
-
       include PlatformTrace
 
       # Implement this method in a subclass to apply custom tags to datadog spans

data/lib/graphql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.0.25
+  version: 2.0.26
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips