opentelemetry-instrumentation-graphql 0.26.5 → 0.26.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 882f9b77148ce1df4548a68ea952642e066f83c6374ab117ff225aa0230759a9
-  data.tar.gz: e17b57812cd01e4168bccb3fb16e01bfdc8422fcc47fdc8ab5b1d9c8aa15f73d
+  metadata.gz: ccb31fdce8c98bf2bb4ec81805090426776c5396c7451e650b2a6bb8a6afa53a
+  data.tar.gz: 296640cc5f927a4550a87f401c35dbd61433536a8f3bf718d44a3ecc140a343a
 SHA512:
-  metadata.gz: 86ee690ae6f3085598f3d097c37d9f53ba86e57469b75a0ad4a800377b8de4a197ff5772ff4a288a7e25dc708ffd2a2ec0b6a8378e80ce3f32fe3d1921ba9697
-  data.tar.gz: 958032ccc0726720a9b59d7cae647e46c101346a1206454ac08656fcfd4550ff1770facf101ac82ba83d14176565cfdd2eb7610c1c6a90bf0d85810eb6599885
+  metadata.gz: a802470c26d4681da1048e762ed66d73142e488202c86838e19c7dfbd8fa048b34b686cc182def58f1ecc7c7e8ea9b086135f55941a1dba9723b0d54976b08c7
+  data.tar.gz: b7700b9cb48fa2b6b32527a2b668aaaec9920874e4af656d3edafb4a2f0d9f84dfddece3f3c664eb866ec9ae962f6785b00eeb93b3c471f6c890ae5d0ebb3331

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-graphql
 
+### v0.26.7 / 2023-09-27
+
+* FIXED: Micro optimization: build Hash w/ {} (https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/665)
+
+### 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

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,76 +72,82 @@ 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 = {}
-            attributes['graphql.field.parent'] = field.owner&.graphql_name
-            attributes['graphql.field.name'] = field.graphql_name
-            attributes['graphql.lazy'] = false
+            attributes = {
+              'graphql.field.parent' => field.owner&.graphql_name,
+              'graphql.field.name' => field.graphql_name,
+              'graphql.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: field)
+            platform_key = _otel_execute_field_key(field: field)
             return super unless platform_key
 
-            attributes = {}
-            attributes['graphql.field.parent'] = field.owner&.graphql_name
-            attributes['graphql.field.name'] = field.graphql_name
-            attributes['graphql.lazy'] = true
+            attributes = {
+              'graphql.field.parent' => field.owner&.graphql_name,
+              'graphql.field.name' => field.graphql_name,
+              'graphql.lazy' => true
+            }
 
             tracer.in_span(platform_key, attributes: attributes, &block)
           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 = {}
-            attributes['graphql.type.name'] = type.graphql_name
-            attributes['graphql.lazy'] = false
+            attributes = {
+              'graphql.type.name' => type.graphql_name,
+              '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]
+            platform_key = @_otel_authorized_key_cache[type]
             return super unless platform_key
 
-            attributes = {}
-            attributes['graphql.type.name'] = type.graphql_name
-            attributes['graphql.lazy'] = true
+            attributes = {
+              'graphql.type.name' => type.graphql_name,
+              'graphql.lazy' => true
+            }
 
             tracer.in_span(platform_key, attributes: attributes, &block)
           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
-            attributes['graphql.lazy'] = false
+            attributes = {
+              'graphql.type.name' => type.graphql_name,
+              'graphql.lazy' => false
+            }
 
             tracer.in_span(platform_key, attributes: attributes, &block)
           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
-            attributes['graphql.lazy'] = true
+            attributes = {
+              'graphql.type.name' => type.graphql_name,
+              'graphql.lazy' => true
+            }
 
             tracer.in_span(platform_key, attributes: attributes, &block)
           end
 
           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 +161,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 +171,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 +181,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/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module GraphQL
-      VERSION = '0.26.5'
+      VERSION = '0.26.7'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-graphql
 version: !ruby/object:Gem::Version
-  version: 0.26.5
+  version: 0.26.7
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-03 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.55.1
+        version: 1.56.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.55.1
+        version: 1.56.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.6
+        version: '3.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.6
+        version: '3.19'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -198,20 +198,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: yard-doctest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.6
 description: GraphQL instrumentation for the OpenTelemetry framework
 email:
 - cncf-opentelemetry-contributors@lists.cncf.io
@@ -234,10 +220,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.5/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-graphql/0.26.7/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.5
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-graphql/0.26.7
 post_install_message: 
 rdoc_options: []
 require_paths: