opentelemetry-instrumentation-graphql 0.26.2 → 0.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c779f3e4eae9a48b4a87832cd8d065fd086c9a3a9b1bee0d71d849924234d0a1
-  data.tar.gz: ff670c5b08ebbb8db9c99290d051601caf2f766358cb90978ac656299eae4e02
+  metadata.gz: d7dd33ec7aa4e3438bb3fee83f193b0f935654c0cf5144d18616f0cadabb4e50
+  data.tar.gz: 85ce4c04a9725b67f15232bdfd7825565fab723119f49048ad182c2b52249617
 SHA512:
-  metadata.gz: b43c7cef255cba53b3d1ff09f647f03050de365498258ffd65ba36267046461ca85fde87effc8366e8f07c92ddbdb694807ad5061dd9b256767c49fcb5e04d85
-  data.tar.gz: 85b20c4104cb92568aee082e6af35519f122a54c420a6dc736980a06ddefee1885055b2d844bd0208c4cbcd902b54f7edfe3f680fa67084059790136306c8790
+  metadata.gz: 07c6ecd695bc2833b9bbd7f799a64e795fcf214e74097f3e6ca971a92b0345cd375283efffba0fd3cfb8f70d1f3469d20cd15a1b170eb964c5e6e9766d88d337
+  data.tar.gz: 66286561a18df82a1d507256989a0bc0b066608244d0771f69ffc8852cab5ba0a6b4bcb1f711b66ed4f05ecffa159463a8bb62e564ffa4be4dc3ce9763cc9333

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-graphql
 
+### v0.26.4 / 2023-08-01
+
+* FIXED: GraphQL tests and installation
+
+### v0.26.3 / 2023-07-29
+
+* FIXED: GraphQL validate events
+
 ### v0.26.2 / 2023-06-05
 
 * FIXED: Base config options 

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

@@ -13,9 +13,9 @@ module OpenTelemetry
       class Instrumentation < OpenTelemetry::Instrumentation::Base
         compatible do
           if config[:legacy_tracing]
-            legacy_tracing_requirement_satisfied?
+            supports_legacy_tracer?
           else
-            Gem::Requirement.new('>= 2.0.18', '< 3.0.0').satisfied_by?(gem_version)
+            supports_new_tracer?
           end
         end
 
@@ -33,8 +33,12 @@ module OpenTelemetry
           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)
+        def supports_legacy_tracer?
+          Gem::Requirement.new('!= 2.0.18').satisfied_by?(gem_version)
+        end
+
+        def supports_new_tracer?
+          Gem::Requirement.new('>= 2.0.19').satisfied_by?(gem_version)
         end
 
         ## Supported configuration keys for the install config hash:

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

@@ -36,12 +36,13 @@ module OpenTelemetry
           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?
+                errors = response[:errors]&.compact&.map(&:to_h) || []
+
+                unless errors.empty?
                   span.add_event(
                     'graphql.validation.error',
                     attributes: {
-                      'message' => errors
+                      'exception.message' => errors.to_json
                     }
                   )
                 end

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

@@ -29,12 +29,15 @@ module OpenTelemetry
 
             tracer.in_span(platform_key, attributes: attributes_for(key, data)) do |span|
               yield.tap do |response|
-                errors = response[:errors]&.compact&.map(&:to_h)&.to_json if key == 'validate'
-                unless errors.nil?
+                next unless key == 'validate'
+
+                errors = response[:errors]&.compact&.map(&:to_h) || []
+
+                unless errors.empty?
                   span.add_event(
                     'graphql.validation.error',
                     attributes: {
-                      'message' => errors
+                      'exception.message' => errors.to_json
                     }
                   )
                 end

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

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

data/lib/opentelemetry/instrumentation/graphql.rb

@@ -15,5 +15,5 @@ module OpenTelemetry
   end
 end
 
-require_relative './graphql/instrumentation'
-require_relative './graphql/version'
+require_relative 'graphql/instrumentation'
+require_relative 'graphql/version'

data/lib/opentelemetry/instrumentation.rb

@@ -16,4 +16,4 @@ module OpenTelemetry
   end
 end
 
-require_relative './instrumentation/graphql'
+require_relative 'instrumentation/graphql'

data/lib/opentelemetry-instrumentation-graphql.rb

@@ -4,4 +4,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require_relative './opentelemetry/instrumentation'
+require_relative 'opentelemetry/instrumentation'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-graphql
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.4
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2023-08-01 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.50.2
+        version: 1.54.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.50.2
+        version: 1.54.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.2/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-graphql/0.26.4/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.2
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-graphql/0.26.4
 post_install_message: 
 rdoc_options: []
 require_paths: