opentelemetry-instrumentation-graphql 0.24.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee94c6575126480273567752f084342cb62ce26eec34a2113ace620db38089a
-  data.tar.gz: d33e9db5196fce7bd7d25634bb82186b41c8fa2df823c3f2c79828c797bbb036
+  metadata.gz: a43a35c233d2adf52df479778bab10dfb4596bf2e7086782741053a7ee65cc63
+  data.tar.gz: e4dee2b3c3e802bf713678d2968bb196e244d601f757c87f1849d21ce5ee743e
 SHA512:
-  metadata.gz: 88c902f56c4c01fd87c582e1ea2b95da47e6966dbd7ca69168c3fe71bf83fc73719fa878fcf7a8c07fe0175c206af2061e97ce030eb99054bab223d89e4d0ae2
-  data.tar.gz: d33e083ef2d3a7b017acffb548a0c26b7b1a99920e80b8ac1a58dd290fd1a91f41b498b8c3d3106e5f8d439317fe66b994686023ebeb62595ee9d4766c889609
+  metadata.gz: 4f1c9532656d0626302509ca2d4ffe805eef53d24ae360e3bf3b84bbc8ed6587496f7dcc9677f009fe3ca29bcd97523c8e419cb7fad309f1b64ca6fe582c52c0
+  data.tar.gz: fc763aa2ac3468c0ba901f6a9fee2b0e826f8117a3130a5f9f83e87fa10391f7b80ddfe8837a1e466e4e9312b9bd44033dc66f5a04bac27351b8c77d3ea51de4

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History: opentelemetry-instrumentation-graphql
 
+### v0.26.0 / 2023-05-17
+
+* BREAKING CHANGE: GraphQL instrumentation: support new tracing API 
+
+* ADDED: GraphQL instrumentation: support new tracing API
+
+### v0.25.0 / 2023-04-17
+
+* BREAKING CHANGE: Drop support for EoL Ruby 2.7 
+
+* ADDED: Drop support for EoL Ruby 2.7 
+
 ### v0.24.0 / 2023-03-15
 
 * BREAKING CHANGE: Add support for GraphQL 2.0.19

data/lib/opentelemetry/instrumentation/graphql/instrumentation.rb

@@ -12,19 +12,31 @@ module OpenTelemetry
       # The Instrumentation class contains logic to detect and install the GraphQL instrumentation
       class Instrumentation < OpenTelemetry::Instrumentation::Base
         compatible do
-          Gem::Requirement.new('<= 2.0.17').satisfied_by?(gem_version) ||
-            Gem::Requirement.new('~> 2.0.19').satisfied_by?(gem_version)
+          if config[:legacy_tracing]
+            legacy_tracing_requirement_satisfied?
+          else
+            Gem::Requirement.new('>= 2.0.18', '< 3.0.0').satisfied_by?(gem_version)
+          end
         end
 
         install do |config|
-          require_dependencies
-          install_tracer(config)
+          if config[:legacy_tracing]
+            require_relative 'tracers/graphql_tracer'
+            install_tracer(config)
+          else
+            require_relative 'tracers/graphql_trace'
+            install_new_tracer(config)
+          end
         end
 
         present do
           defined?(::GraphQL)
         end
 
+        def legacy_tracing_requirement_satisfied?
+          Gem::Requirement.new('<= 2.0.17').satisfied_by?(gem_version) || Gem::Requirement.new('~> 2.0.19').satisfied_by?(gem_version)
+        end
+
         ## Supported configuration keys for the install config hash:
         #
         # The enable_platform_field key expects a boolean value,
@@ -49,6 +61,7 @@ module OpenTelemetry
         option :enable_platform_authorized,   default: false, validate: :boolean
         option :enable_platform_resolve_type, default: false, validate: :boolean
         option :legacy_platform_span_names,   default: false, validate: :boolean
+        option :legacy_tracing,               default: false, validate: :boolean
 
         private
 
@@ -56,10 +69,6 @@ module OpenTelemetry
           Gem::Version.new(::GraphQL::VERSION)
         end
 
-        def require_dependencies
-          require_relative 'tracers/graphql_tracer'
-        end
-
         def install_tracer(config = {})
           if config[:schemas].empty?
             ::GraphQL::Schema.tracer(Tracers::GraphQLTracer.new)
@@ -71,6 +80,18 @@ module OpenTelemetry
             end
           end
         end
+
+        def install_new_tracer(config = {})
+          if config[:schemas].empty?
+            ::GraphQL::Schema.trace_with(Tracers::GraphQLTrace)
+          else
+            config[:schemas].each do |schema|
+              schema.trace_with(Tracers::GraphQLTrace)
+            rescue StandardError => e
+              OpenTelemetry.logger.error("Unable to patch schema #{schema}: #{e.message}")
+            end
+          end
+        end
       end
     end
   end

data/lib/opentelemetry/instrumentation/graphql/tracers/graphql_trace.rb

@@ -0,0 +1,197 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require 'opentelemetry'
+
+module OpenTelemetry
+  module Instrumentation
+    module GraphQL
+      module Tracers
+        # GraphQLTrace contains the OpenTelemetry tracer implementation compatible with
+        # the new GraphQL tracing API (>= 2.0.18)
+        module GraphQLTrace # rubocop:disable Metrics/ModuleLength
+          def initialize(trace_scalars: false, **_options)
+            @trace_scalars = trace_scalars
+            @platform_field_key_cache = Hash.new { |h, k| h[k] = platform_field_key(k) }
+            @platform_authorized_key_cache = Hash.new { |h, k| h[k] = platform_authorized_key(k) }
+            @platform_resolve_type_key_cache = Hash.new { |h, k| h[k] = platform_resolve_type_key(k) }
+            super
+          end
+
+          def execute_multiplex(multiplex:, &block)
+            tracer.in_span('graphql.execute_multiplex', &block)
+          end
+
+          def lex(query_string:, &block)
+            tracer.in_span('graphql.lex', &block)
+          end
+
+          def parse(query_string:, &block)
+            tracer.in_span('graphql.parse', &block)
+          end
+
+          def validate(query:, validate:, &block)
+            tracer.in_span('graphql.validate') do |span|
+              super.tap do |response|
+                errors = response[:errors]&.compact&.map(&:to_h)&.to_json
+                unless errors.nil?
+                  span.add_event(
+                    'graphql.validation.error',
+                    attributes: {
+                      'message' => errors
+                    }
+                  )
+                end
+              end
+            end
+          end
+
+          def analyze_multiplex(multiplex:, &block)
+            tracer.in_span('graphql.analyze_query', &block)
+          end
+
+          def analyze_query(query:, &block)
+            tracer.in_span('graphql.analyze_multiplex', &block)
+          end
+
+          def execute_query(query:, &block)
+            attributes = {}
+            attributes['graphql.operation.name'] = query.selected_operation_name if query.selected_operation_name
+            attributes['graphql.operation.type'] = query.selected_operation.operation_type
+            attributes['graphql.document'] = query.query_string
+
+            tracer.in_span('graphql.execute_query', attributes: attributes, &block)
+          end
+
+          def execute_query_lazy(query:, &block)
+            tracer.in_span('graphql.execute_query_lazy', &block)
+          end
+
+          def execute_field(field:, query:, ast_node:, arguments:, object:, &block)
+            platform_key = platform_execute_field_key(field)
+            return super unless platform_key
+
+            attributes = {}
+            attributes['graphql.field.parent'] = field.owner&.graphql_name
+            attributes['graphql.field.name'] = field.graphql_name
+            attributes['graphql.field.lazy'] = false
+
+            tracer.in_span(platform_key, attributes: attributes, &block)
+          end
+
+          def execute_field_lazy(field:, query:, ast_node:, arguments:, object:, &block)
+            platform_key = platform_execute_field_key(field)
+            return super unless platform_key
+
+            attributes = {}
+            attributes['graphql.field.parent'] = field.owner&.graphql_name
+            attributes['graphql.field.name'] = field.graphql_name
+            attributes['graphql.field.lazy'] = true
+
+            tracer.in_span(platform_key, attributes: attributes, &block)
+          end
+
+          def authorized(query:, type:, object:, &block)
+            platform_key = @platform_authorized_key_cache[type]
+            return super unless platform_key
+
+            attributes = {}
+            attributes['graphql.type.name'] = type.graphql_name
+            attributes['graphql.lazy'] = false
+
+            tracer.in_span(platform_key, attributes: attributes, &block)
+          end
+
+          def authorized_lazy(query:, type:, object:, &block)
+            platform_key = @platform_authorized_key_cache[type]
+            return super unless platform_key
+
+            attributes = {}
+            attributes['graphql.type.name'] = type.graphql_name
+            attributes['graphql.lazy'] = true
+
+            tracer.in_span(platform_key, attributes: attributes, &block)
+          end
+
+          def resolve_type(query:, type:, object:)
+            platform_key = @platform_resolve_type_key_cache[type]
+
+            attributes = {}
+            attributes['graphql.type.name'] = type.graphql_name
+            attributes['graphql.lazy'] = false
+
+            tracer.in_span(platform_key, attributes: attributes, &block)
+          end
+
+          def resolve_type_lazy(query:, type:, object:)
+            platform_key = @platform_resolve_type_key_cache[type]
+
+            attributes = {}
+            attributes['graphql.type.name'] = type.graphql_name
+            attributes['graphql.lazy'] = true
+
+            tracer.in_span(platform_key, attributes: attributes, &block)
+          end
+
+          private
+
+          def platform_execute_field_key(field:, &block)
+            platform_key = @platform_field_key_cache[field] if trace_field?(field)
+            platform_key if !platform_key.nil? && trace_field
+          end
+
+          def trace_field?(field)
+            return_type = field.type.unwrap
+
+            if return_type.kind.scalar? || return_type.kind.enum?
+              (field.trace.nil? && @trace_scalars) || field.trace
+            else
+              true
+            end
+          end
+
+          def platform_field_key(field)
+            return unless config[:enable_platform_field]
+
+            if config[:legacy_platform_span_names]
+              field.path
+            else
+              'graphql.execute_field'
+            end
+          end
+
+          def platform_authorized_key(type)
+            return unless config[:enable_platform_authorized]
+
+            if config[:legacy_platform_span_names]
+              "#{type.graphql_name}.authorized"
+            else
+              'graphql.authorized'
+            end
+          end
+
+          def platform_resolve_type_key(type)
+            return unless config[:enable_platform_resolve_type]
+
+            if config[:legacy_platform_span_names]
+              "#{type.graphql_name}.resolve_type"
+            else
+              'graphql.resolve_type'
+            end
+          end
+
+          def tracer
+            GraphQL::Instrumentation.instance.tracer
+          end
+
+          def config
+            GraphQL::Instrumentation.instance.config
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/instrumentation/graphql/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module GraphQL
-      VERSION = '0.24.0'
+      VERSION = '0.26.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-graphql
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.26.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -118,16 +118,16 @@ dependencies:
   name: opentelemetry-test-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.41.1
+        version: 1.50.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.41.1
+        version: 1.50.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -227,16 +227,17 @@ files:
 - lib/opentelemetry/instrumentation.rb
 - lib/opentelemetry/instrumentation/graphql.rb
 - lib/opentelemetry/instrumentation/graphql/instrumentation.rb
+- lib/opentelemetry/instrumentation/graphql/tracers/graphql_trace.rb
 - lib/opentelemetry/instrumentation/graphql/tracers/graphql_tracer.rb
 - lib/opentelemetry/instrumentation/graphql/version.rb
 homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-graphql/0.24.0/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-graphql/0.26.0/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/graphql
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-graphql/0.24.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-graphql/0.26.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -245,14 +246,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: GraphQL instrumentation for the OpenTelemetry framework