graphql 1.13.14 → 1.13.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '032739327be4e27b1c7d2dbc3d24a5db771a713ec683238da1e9cd850993ff73'
-  data.tar.gz: b8c12e62126d761283086ccda4095812db080611b463bb0770603ea85c965c02
+  metadata.gz: cc7b2a76a8b1650e6669a7f266ff580a3cb78f214307f26527197944441516c9
+  data.tar.gz: 9d12f456ee5699eaccc7956ee942ca8165fcca61437b5f9f841abd70b245c52b
 SHA512:
-  metadata.gz: c1a66366e1cceae9717bf8a4dc902cf9a670cee49e5017d45d7b9375149f579fa54f31ed0d47b73f71552c4b9c62de108f29eaa2ad59a6bc5fcf8cff7bc2bbc8
-  data.tar.gz: d83ce36125d77157290b60d0b66dbb01a7a3c8eac6d5f99c4c025e0e4cc511917d04c01a53357f74fd7554fcbf3ec91d5ead5b25c7a718565a6bf8b198de50fc
+  metadata.gz: 00b5e6d26cdb8f62002e66aef32e8b905091f6fdb9f8066cc4537a4747478764bc919b172dd0085e9ab076c7e796158c24de0d2d2483b22dc494d7b96e4f309c
+  data.tar.gz: 1dd5c023bccaa8b9f6de3ca6cf9a7153c937ca74fb47c31fd29da9d5dce9942fd779bdd38d5526ef7f107c5bd91eabdaa2c8b74df75c1b57836f3068a085526e

data/lib/graphql/query/validation_pipeline.rb

@@ -16,10 +16,9 @@ module GraphQL
     class ValidationPipeline
       attr_reader :max_depth, :max_complexity
 
-      def initialize(query:, validate:, parse_error:, operation_name_error:, max_depth:, max_complexity:)
+      def initialize(query:, parse_error:, operation_name_error:, max_depth:, max_complexity:)
         @validation_errors = []
         @internal_representation = nil
-        @validate = validate
         @parse_error = parse_error
         @operation_name_error = operation_name_error
         @query = query
@@ -72,7 +71,7 @@ module GraphQL
         elsif @operation_name_error
           @validation_errors << @operation_name_error
         else
-          validation_result = @schema.static_validator.validate(@query, validate: @validate, timeout: @schema.validate_timeout, max_errors: @schema.validate_max_errors)
+          validation_result = @schema.static_validator.validate(@query, validate: @query.validate, timeout: @schema.validate_timeout, max_errors: @schema.validate_max_errors)
           @validation_errors.concat(validation_result[:errors])
           @internal_representation = validation_result[:irep]
 

data/lib/graphql/query.rb

@@ -434,7 +434,6 @@ module GraphQL
 
       @validation_pipeline = GraphQL::Query::ValidationPipeline.new(
         query: self,
-        validate: @validate,
         parse_error: parse_error,
         operation_name_error: operation_name_error,
         max_depth: @max_depth,

data/lib/graphql/tracing.rb

@@ -9,7 +9,6 @@ require "graphql/tracing/scout_tracing"
 require "graphql/tracing/skylight_tracing"
 require "graphql/tracing/statsd_tracing"
 require "graphql/tracing/prometheus_tracing"
-require "graphql/tracing/opentelemetry_tracing"
 
 if defined?(PrometheusExporter::Server)
   require "graphql/tracing/prometheus_tracing/graphql_collector"

data/lib/graphql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.13.14
+  version: 1.13.15
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-20 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -659,7 +659,6 @@ files:
 - lib/graphql/tracing/data_dog_tracing.rb
 - lib/graphql/tracing/new_relic_tracing.rb
 - lib/graphql/tracing/notifications_tracing.rb
-- lib/graphql/tracing/opentelemetry_tracing.rb
 - lib/graphql/tracing/platform_tracing.rb
 - lib/graphql/tracing/prometheus_tracing.rb
 - lib/graphql/tracing/prometheus_tracing/graphql_collector.rb

data/lib/graphql/tracing/opentelemetry_tracing.rb

@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-module GraphQL
-  module Tracing
-    class OpenTelemetryTracing < PlatformTracing
-      self.platform_keys = {
-        'lex' => 'graphql.lex',
-        'parse' => 'graphql.parse',
-        'validate' => 'graphql.validate',
-        'analyze_query' => 'graphql.analyze_query',
-        'analyze_multiplex' => 'graphql.analyze_multiplex',
-        'execute_query' => 'graphql.execute_query',
-        'execute_query_lazy' => 'graphql.execute_query_lazy',
-        'execute_multiplex' => 'graphql.execute_multiplex'
-      }
-
-      def platform_trace(platform_key, key, data)
-        return yield if platform_key.nil?
-
-        tracer.in_span(platform_key, attributes: attributes_for(key, data)) do |span, _context|
-          yield.tap do |response|
-            errors = response[:errors]&.compact&.map { |e| e.to_h }&.to_json if key == 'validate'
-            unless errors.nil?
-              span.add_event(
-                'graphql.validation.error',
-                attributes: {
-                  'message' => errors
-                }
-              )
-            end
-          end
-        end
-      end
-
-      def platform_field_key(type, field)
-        "#{type.graphql_name}.#{field.graphql_name}"
-      end
-
-      def platform_authorized_key(type)
-        "#{type.graphql_name}.authorized"
-      end
-
-      def platform_resolve_type_key(type)
-        "#{type.graphql_name}.resolve_type"
-      end
-
-      private
-
-      def tracer
-        OpenTelemetry::Instrumentation::GraphQL::Instrumentation.instance.tracer
-      end
-
-      def config
-        OpenTelemetry::Instrumentation::GraphQL::Instrumentation.instance.config
-      end
-
-      def platform_key_enabled?(ctx, key)
-        return false unless config[key]
-
-        ns = ctx.namespace(:opentelemetry)
-        return true if ns.empty? # restores original behavior so that keys are returned if tracing is not set in context.
-        return false unless ns.key?(key) && ns[key]
-
-        return true
-      end
-
-      def attributes_for(key, data)
-        attributes = {}
-        case key
-        when 'execute_query'
-          attributes['selected_operation_name'] = data[:query].selected_operation_name if data[:query].selected_operation_name
-          attributes['selected_operation_type'] = data[:query].selected_operation.operation_type
-          attributes['query_string'] = data[:query].query_string
-        end
-        attributes
-      end
-
-      def cached_platform_key(ctx, key, trace_phase)
-        cache = ctx.namespace(self.class)[:platform_key_cache] ||= {}
-
-        cache.fetch(key) do
-          cache[key] = if trace_phase == :field
-            return unless platform_key_enabled?(ctx, :enable_platform_field)
-
-            yield
-          elsif trace_phase == :authorized
-            return unless platform_key_enabled?(ctx, :enable_platform_authorized)
-
-            yield
-          elsif trace_phase == :resolve_type
-            return unless platform_key_enabled?(ctx, :enable_platform_resolve_type)
-
-            yield
-          else
-            raise "Unknown trace phase"
-          end
-        end
-      end
-    end
-  end
-end