graphql-metrics 5.0.5 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f93d51a57f59de189c9b97ad3f0f26eee049c3ec1af8dc77951cb3e892558f8
-  data.tar.gz: 62531e77262446959b6309c57a34e29313d8c006af3acbd2a9b74b02888d78d7
+  metadata.gz: efe8bea1e59d9020f597627aedf1cde1735d6c2558c5910e3e818e5bf7cab6ff
+  data.tar.gz: e28a49b6e546eaa55cb4d8e3b34ad2a81d4ea4b5c7c3edd62f300206d84ff3b1
 SHA512:
-  metadata.gz: 3b8782d2b3ffe8891f2f54e8554b8c3f1e121090fd74525f64ae38730a1bc4d277f0fa8a4bf7d7ae5e33258edae3e6f31351a1bf897507a92de828fcde5854a7
-  data.tar.gz: 16aa581d6b9073dbd6ca0db8ebada56c6d4af05e74e4f78ac0d20577768068f5f39b620860bfc4cb2470da1825dee9a0f25f8a26ec4e1dddaf8c22e1867ef8c4
+  metadata.gz: 19aa99f9ee90e7af56f762890fab216cabb01d73775b49caa98c896add21272b6f83d149d379df1ee10d5644527bce17e7c8cad7650a411d001684815c1c2cdb
+  data.tar.gz: 0de176edaa686d33f5b8de7986353d64a9b1e80a11293808ae333ecd46f5bd531baa1c871374b297280b0550fc2a791783ddf371e92be55ed21b921a54790ac7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+5.0.6
+-----
+- [74](https://github.com/Shopify/graphql-metrics/pull/74) Fix skip_tracing compatibility with new Tracing API
+
 5.0.5
 -----
 - [73](https://github.com/Shopify/graphql-metrics/pull/73) Fix calls to other traces.

data/lib/graphql/metrics/trace.rb

@@ -5,8 +5,9 @@ module GraphQL
     module Trace
       def initialize(**_rest)
         super
-        context = (@multiplex || @query).context
-        @skip_tracing = context&.fetch(GraphQL::Metrics::SKIP_GRAPHQL_METRICS_ANALYSIS, false)
+
+        query_or_multiplex = @query || @multiplex
+        @skip_tracing = query_or_multiplex.context&.fetch(SKIP_GRAPHQL_METRICS_ANALYSIS, false) if query_or_multiplex
       end
 
       # NOTE: These methods come from the graphql ruby gem and are in "chronological" order based on the phases
@@ -16,7 +17,7 @@ module GraphQL
 
       # wraps everything below this line; only run once
       def execute_multiplex(multiplex:)
-        return super if @skip_tracing
+        return super if skip_tracing?(multiplex)
         capture_multiplex_start_time { super }
       end
 
@@ -33,13 +34,13 @@ module GraphQL
       end
 
       def validate(query:, validate:)
-        return super if @skip_tracing
+        return super if skip_tracing?(query)
         capture_validation_time(query.context) { super }
       end
 
       # wraps all `analyze_query`s; only run once
       def analyze_multiplex(multiplex:)
-        return super if @skip_tracing
+        return super if skip_tracing?(multiplex)
         # 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
@@ -47,29 +48,37 @@ module GraphQL
       end
 
       def analyze_query(query:)
-        return super if @skip_tracing
+        return super if skip_tracing?(query)
         capture_analysis_time(query.context) { super }
       end
 
       def execute_query(query:)
-        return super if @skip_tracing
+        return super if skip_tracing?(query)
         capture_query_start_time(query.context) { super }
       end
 
       def execute_field(field:, query:, ast_node:, arguments:, object:)
-        return super if @skip_tracing || query.context[SKIP_FIELD_AND_ARGUMENT_METRICS]
+        return super if skip_tracing?(query) || 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:)
-        return super if @skip_tracing || query.context[SKIP_FIELD_AND_ARGUMENT_METRICS]
+        return super if skip_tracing?(query) || 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
 
+      def skip_tracing?(query_or_multiplex)
+        if !defined?(@skip_tracing)
+          @skip_tracing = query_or_multiplex.context&.fetch(SKIP_GRAPHQL_METRICS_ANALYSIS, false)
+        end
+
+        @skip_tracing
+      end
+
       PreContext = Struct.new(
         :multiplex_start_time,
         :multiplex_start_time_monotonic,

data/lib/graphql/metrics/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-metrics
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 5.0.6
 platform: ruby
 authors:
 - Christopher Butcher
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-04-12 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.0.3.1
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: GraphQL Metrics Extractor
 test_files: []