opentelemetry-instrumentation-graphql 0.26.4 → 0.26.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7dd33ec7aa4e3438bb3fee83f193b0f935654c0cf5144d18616f0cadabb4e50
-  data.tar.gz: 85ce4c04a9725b67f15232bdfd7825565fab723119f49048ad182c2b52249617
+  metadata.gz: f2ee4e6b6b0313ac55ff8b18be5a3339c3179537d8c0dfc71a0bf008d24c808b
+  data.tar.gz: e74e1ac464c4f7c7bd789b6703163a48a4dd7a57dc0d60b49873551bae2b5624
 SHA512:
-  metadata.gz: 07c6ecd695bc2833b9bbd7f799a64e795fcf214e74097f3e6ca971a92b0345cd375283efffba0fd3cfb8f70d1f3469d20cd15a1b170eb964c5e6e9766d88d337
-  data.tar.gz: 66286561a18df82a1d507256989a0bc0b066608244d0771f69ffc8852cab5ba0a6b4bcb1f711b66ed4f05ecffa159463a8bb62e564ffa4be4dc3ce9763cc9333
+  metadata.gz: 21398d75cd97be83a36b0da4d7155c23b98c0780de93b4f0fc99b041397f1bef7afb79cd1c2ef61eb9f0b054ec8d7b995ec361c4302ae55d66854cd2dbb7e5df
+  data.tar.gz: f4f1bb42e7411615da3588d58badd0b91b693c45186f82a01ba02f732029b40d41018de119f98e0670c95622322ac4bb92ec6c07f81fc9560c556dcbe53b7d68

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-graphql
 
+### v0.26.6 / 2023-08-26
+
+* FIXED: Improve GraphQL tracing compatibility with other tracers
+
+### v0.26.5 / 2023-08-03
+
+* FIXED: Remove inline linter rules
+
 ### v0.26.4 / 2023-08-01
 
 * FIXED: GraphQL tests and installation

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

@@ -15,9 +15,9 @@ module OpenTelemetry
         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) }
+            @_otel_field_key_cache = Hash.new { |h, k| h[k] = _otel_field_key(k) }
+            @_otel_authorized_key_cache = Hash.new { |h, k| h[k] = _otel_authorized_key(k) }
+            @_otel_resolve_type_key_cache = Hash.new { |h, k| h[k] = _otel_resolve_type_key(k) }
             super
           end
 
@@ -72,7 +72,7 @@ module OpenTelemetry
           end
 
           def execute_field(field:, query:, ast_node:, arguments:, object:, &block)
-            platform_key = platform_execute_field_key(field: field)
+            platform_key = _otel_execute_field_key(field: field)
             return super unless platform_key
 
             attributes = {}
@@ -84,7 +84,7 @@ module OpenTelemetry
           end
 
           def execute_field_lazy(field:, query:, ast_node:, arguments:, object:, &block)
-            platform_key = platform_execute_field_key(field: field)
+            platform_key = _otel_execute_field_key(field: field)
             return super unless platform_key
 
             attributes = {}
@@ -96,7 +96,7 @@ module OpenTelemetry
           end
 
           def authorized(query:, type:, object:, &block)
-            platform_key = @platform_authorized_key_cache[type]
+            platform_key = @_otel_authorized_key_cache[type]
             return super unless platform_key
 
             attributes = {}
@@ -107,7 +107,7 @@ module OpenTelemetry
           end
 
           def authorized_lazy(query:, type:, object:, &block)
-            platform_key = @platform_authorized_key_cache[type]
+            platform_key = @_otel_authorized_key_cache[type]
             return super unless platform_key
 
             attributes = {}
@@ -118,7 +118,7 @@ module OpenTelemetry
           end
 
           def resolve_type(query:, type:, object:, &block)
-            platform_key = @platform_resolve_type_key_cache[type]
+            platform_key = @_otel_resolve_type_key_cache[type]
 
             attributes = {}
             attributes['graphql.type.name'] = type.graphql_name
@@ -128,7 +128,7 @@ module OpenTelemetry
           end
 
           def resolve_type_lazy(query:, type:, object:, &block)
-            platform_key = @platform_resolve_type_key_cache[type]
+            platform_key = @_otel_resolve_type_key_cache[type]
 
             attributes = {}
             attributes['graphql.type.name'] = type.graphql_name
@@ -139,9 +139,9 @@ module OpenTelemetry
 
           private
 
-          def platform_execute_field_key(field:, &block)
+          def _otel_execute_field_key(field:, &block)
             trace_field = trace_field?(field)
-            platform_key = @platform_field_key_cache[field] if trace_field
+            platform_key = @_otel_field_key_cache[field] if trace_field
             platform_key if platform_key && trace_field
           end
 
@@ -155,7 +155,7 @@ module OpenTelemetry
             end
           end
 
-          def platform_field_key(field)
+          def _otel_field_key(field)
             return unless config[:enable_platform_field]
 
             if config[:legacy_platform_span_names]
@@ -165,7 +165,7 @@ module OpenTelemetry
             end
           end
 
-          def platform_authorized_key(type)
+          def _otel_authorized_key(type)
             return unless config[:enable_platform_authorized]
 
             if config[:legacy_platform_span_names]
@@ -175,7 +175,7 @@ module OpenTelemetry
             end
           end
 
-          def platform_resolve_type_key(type)
+          def _otel_resolve_type_key(type)
             return unless config[:enable_platform_resolve_type]
 
             if config[:legacy_platform_span_names]

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

@@ -24,7 +24,7 @@ module OpenTelemetry
             'execute_multiplex' => 'graphql.execute_multiplex'
           }
 
-          def platform_trace(platform_key, key, data) # rubocop:disable Metrics/CyclomaticComplexity
+          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|
@@ -85,7 +85,7 @@ module OpenTelemetry
             GraphQL::Instrumentation.instance.config
           end
 
-          def attributes_for(key, data) # rubocop:disable Metrics/CyclomaticComplexity
+          def attributes_for(key, data)
             attributes = {}
             case key
             when 'execute_field', 'execute_field_lazy'

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module GraphQL
-      VERSION = '0.26.4'
+      VERSION = '0.26.6'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-graphql
 version: !ruby/object:Gem::Version
-  version: 0.26.4
+  version: 0.26.6
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.54.1
+        version: 1.55.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.54.1
+        version: 1.55.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -234,10 +234,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-graphql/0.26.4/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-graphql/0.26.6/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.26.4
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-graphql/0.26.6
 post_install_message: 
 rdoc_options: []
 require_paths: