graphql-metrics 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7422838e228e2f0dd82382ee2b165b7ab7dfee2b5430044d5b8e2e3f83da173a
-  data.tar.gz: 934f63e77e19731fa2f675185d92d81c30b9087a747cfddc7798986327b85a8c
+  metadata.gz: 9f93d51a57f59de189c9b97ad3f0f26eee049c3ec1af8dc77951cb3e892558f8
+  data.tar.gz: 62531e77262446959b6309c57a34e29313d8c006af3acbd2a9b74b02888d78d7
 SHA512:
-  metadata.gz: 16f4f5ed3f00779216232748c5ad45e248b90b8827568d6f323e3a9477e61e273f67e66893bb439494d3e88526b8aec84a7fe1d35691b283235687cecacdbf58
-  data.tar.gz: c69155471bc5c372903af17d8311b0a6f95c55df7f8e490436217ffbfb0c4472401567375ed097bc11b93aa4cd1276f3d64a7d09e6d3e41254efc0fbed0a1156
+  metadata.gz: 3b8782d2b3ffe8891f2f54e8554b8c3f1e121090fd74525f64ae38730a1bc4d277f0fa8a4bf7d7ae5e33258edae3e6f31351a1bf897507a92de828fcde5854a7
+  data.tar.gz: 16aa581d6b9073dbd6ca0db8ebada56c6d4af05e74e4f78ac0d20577768068f5f39b620860bfc4cb2470da1825dee9a0f25f8a26ec4e1dddaf8c22e1867ef8c4

data/CHANGELOG.md

@@ -1,5 +1,10 @@
+5.0.5
+-----
+- [73](https://github.com/Shopify/graphql-metrics/pull/73) Fix calls to other traces.
+
 5.0.4
 -----
+- [66](https://github.com/Shopify/graphql-metrics/pull/66) Support graphql-ruby's new tracing API (backwards compatible)
 - [71](https://github.com/Shopify/graphql-metrics/pull/71) Fix handling of inline fragment without a parent type.
 
 5.0.3

data/lib/graphql/metrics/trace.rb

@@ -15,58 +15,57 @@ module GraphQL
       # multiplexing multiple queries.
 
       # wraps everything below this line; only run once
-      def execute_multiplex(multiplex:, &block)
-        return yield if @skip_tracing
-        capture_multiplex_start_time(&block)
-
+      def execute_multiplex(multiplex:)
+        return super if @skip_tracing
+        capture_multiplex_start_time { super }
       end
 
       # may not trigger if the query is passed in pre-parsed
-      def lex(query_string:, &block)
-        return yield if @skip_tracing
-        capture_lexing_time(&block)
+      def lex(query_string:)
+        return super if @skip_tracing
+        capture_lexing_time { super }
       end
 
       # may not trigger if the query is passed in pre-parsed
-      def parse(query_string:, &block)
-        return yield if @skip_tracing
-        capture_parsing_time(&block)
+      def parse(query_string:)
+        return super if @skip_tracing
+        capture_parsing_time { super }
       end
 
-      def validate(query:, validate:, &block)
-        return yield if @skip_tracing
-        capture_validation_time(query.context, &block)
+      def validate(query:, validate:)
+        return super if @skip_tracing
+        capture_validation_time(query.context) { super }
       end
 
       # wraps all `analyze_query`s; only run once
-      def analyze_multiplex(multiplex:, &block)
-        return yield if @skip_tracing
+      def analyze_multiplex(multiplex:)
+        return super if @skip_tracing
         # Ensures that we reset potentially long-lived PreContext objects between multiplexs. We reset at this point
         # since all parsing and validation will be done by this point, and a GraphQL::Query::Context will exist.
         pre_context.reset
-        yield
+        super
       end
 
-      def analyze_query(query:, &block)
-        return yield if @skip_tracing
-        capture_analysis_time(query.context, &block)
+      def analyze_query(query:)
+        return super if @skip_tracing
+        capture_analysis_time(query.context) { super }
       end
 
-      def execute_query(query:, &block)
-        return yield if @skip_tracing
-        capture_query_start_time(query.context, &block)
+      def execute_query(query:)
+        return super if @skip_tracing
+        capture_query_start_time(query.context) { super }
       end
 
-      def execute_field(field:, query:, ast_node:, arguments:, object:, &block)
-        return yield if @skip_tracing || query.context[SKIP_FIELD_AND_ARGUMENT_METRICS]
-        return yield unless GraphQL::Metrics.timings_capture_enabled?(query.context)
-        trace_field(GraphQL::Metrics::INLINE_FIELD_TIMINGS, query, &block)
+      def execute_field(field:, query:, ast_node:, arguments:, object:)
+        return super if @skip_tracing || query.context[SKIP_FIELD_AND_ARGUMENT_METRICS]
+        return super unless GraphQL::Metrics.timings_capture_enabled?(query.context)
+        trace_field(GraphQL::Metrics::INLINE_FIELD_TIMINGS, query) { super }
       end
 
-      def execute_field_lazy(field:, query:, ast_node:, arguments:, object:, &block)
-        return yield if @skip_tracing || query.context[SKIP_FIELD_AND_ARGUMENT_METRICS]
-        return yield unless GraphQL::Metrics.timings_capture_enabled?(query.context)
-        trace_field(GraphQL::Metrics::LAZY_FIELD_TIMINGS, query, &block)
+      def execute_field_lazy(field:, query:, ast_node:, arguments:, object:)
+        return super if @skip_tracing || query.context[SKIP_FIELD_AND_ARGUMENT_METRICS]
+        return super unless GraphQL::Metrics.timings_capture_enabled?(query.context)
+        trace_field(GraphQL::Metrics::LAZY_FIELD_TIMINGS, query) { super }
       end
 
       private

data/lib/graphql/metrics/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module Metrics
-    VERSION = "5.0.4"
+    VERSION = "5.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-metrics
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 platform: ruby
 authors:
 - Christopher Butcher
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -230,7 +230,7 @@ homepage: https://github.com/Shopify/graphql-metrics
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -245,8 +245,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: GraphQL Metrics Extractor
 test_files: []