graphql-metrics 5.0.0 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e2e02bf92da34c67af89cf112efe2525ca4a785f4f9169dd35320c687f5f9f4
-  data.tar.gz: 4ec1a5b37180e5e7be02934992347053d3d4a4d2f03866975600577704e141a1
+  metadata.gz: 193863b65e11d92f46e0e88e31d3d07bf7bfc3b8f3f78566ab1ea03f0480a027
+  data.tar.gz: '029dacd1491b30aaaed8f1f29f08de8df61621690e68c437c493acd19be48c58'
 SHA512:
-  metadata.gz: 213906efdd58b32a7cab558028fc96de33c9624f9e85ffbb572954486bb31bebc7e718f0aee4e6df4f7324d5c99c6cc1849d13a54e43bef1963a3b55517796e1
-  data.tar.gz: 4f6309cc4cdbe2244be1d744173f795df04e955af9cef6d52111f1181c074cece01dcf226ebe20a545f3f2d41306b5eb5226e4d90ec1a7ece70656707982934a
+  metadata.gz: b785685753bf27bd368fcca80a9054dad9ad7d829d1a6931eb3c9ddc9090e33e7fe48a6a4d8d3305ae753078b8b47e9b6df9e65f54b497c05f15f1861ce3029e
+  data.tar.gz: 4bb9ab1cc43808134b16a071b4d3292c7416614f1d9d59e398c62f5843d9b53175f569385b5f4a74013a5b7817b73487f08a48736aba7228a543596a3f6271d8

data/.github/workflows/cla.yml

@@ -0,0 +1,22 @@
+name: Contributor License Agreement (CLA)
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+  issue_comment:
+    types: [created]
+
+jobs:
+  cla:
+    runs-on: ubuntu-latest
+    if: |
+      (github.event.issue.pull_request
+        && !github.event.issue.pull_request.merged_at
+        && contains(github.event.comment.body, 'signed')
+      )
+      || (github.event.pull_request && !github.event.pull_request.merged)
+    steps:
+      - uses: Shopify/shopify-cla-action@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cla-token: ${{ secrets.CLA_TOKEN }}

data/.github/workflows/ruby.yml

@@ -1,20 +1,20 @@
-name: Ruby
-
-on: [push]
-
+name: Tests
+on: [push, pull_request]
 jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        ruby: ['2.7', '3.0', '3.1', '3.2']
+        gemfile: ['graphql_1.13', 'graphql_2.0']
+    runs-on: ${{ matrix.os }}
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
-    - name: Build and test with Rake
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
-        bundle exec rake test
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+3.2.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+5.0.2
+-----
+- [63](https://github.com/Shopify/graphql-metrics/pull/67) Reset `lex` pre-context metrics on `analyze_multiplex`.
+5.0.1
+-----
+- [63](https://github.com/Shopify/graphql-metrics/pull/63) Eliminate `TimedResult` objects for `trace_field`.
 5.0.0
 -----
 - [50](https://github.com/Shopify/graphql-metrics/pull/50) Capture metrics for directives and their arguments.

data/README.md

@@ -2,7 +2,7 @@
 
 ![](https://github.com/Shopify/graphql-metrics/workflows/Ruby/badge.svg)
 
-Extract as much much detail as you want from GraphQL queries, served up from your Ruby app and the [`graphql` gem](https://github.com/rmosolgo/graphql-ruby).
+Extract as much detail as you want from GraphQL queries, served up from your Ruby app and the [`graphql` gem](https://github.com/rmosolgo/graphql-ruby).
 Compatible with the [`graphql-batch` gem](https://github.com/Shopify/graphql-batch), to extract batch-loaded fields resolution timings.
 
 Be sure to read the [CHANGELOG](CHANGELOG.md) to stay updated on feature additions, breaking changes made to this gem.

data/gemfiles/graphql_1.13.gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+eval_gemfile("../Gemfile")
+
+gem("graphql", "~> 1.13")

data/gemfiles/graphql_2.0.gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+eval_gemfile("../Gemfile")
+
+gem("graphql", "~> 2.0")

data/lib/graphql/metrics/tracer.rb

@@ -75,6 +75,8 @@ module GraphQL
           self[:multiplex_start_time_monotonic] = nil
           self[:parsing_start_time_offset] = nil
           self[:parsing_duration] = nil
+          self[:lexing_start_time_offset] = nil
+          self[:lexing_duration] = nil
         end
       end
 
@@ -93,10 +95,7 @@ module GraphQL
       end
 
       def capture_lexing_time
-        # GraphQL::Query#result fires `lex` before the `execute_multiplex` event, so sometimes
-        # `pre_context.multiplex_start_time_monotonic` isn't set.
-        lexing_offset_time = pre_context.multiplex_start_time_monotonic || GraphQL::Metrics.current_time_monotonic
-        timed_result = GraphQL::Metrics.time(lexing_offset_time) { yield }
+        timed_result = GraphQL::Metrics.time { yield }
 
         pre_context.lexing_start_time_offset = timed_result.start_time
         pre_context.lexing_duration = timed_result.duration
@@ -105,10 +104,7 @@ module GraphQL
       end
 
       def capture_parsing_time
-        # GraphQL::Query#result fires `parse` before the `execute_multiplex` event, so sometimes
-        # `pre_context.multiplex_start_time_monotonic` isn't set.
-        parsing_offset_time = pre_context.multiplex_start_time_monotonic || GraphQL::Metrics.current_time_monotonic
-        timed_result = GraphQL::Metrics.time(parsing_offset_time) { yield }
+        timed_result = GraphQL::Metrics.time { yield }
 
         pre_context.parsing_start_time_offset = timed_result.start_time
         pre_context.parsing_duration = timed_result.duration
@@ -166,17 +162,21 @@ module GraphQL
 
       def trace_field(context_key, data)
         ns = data[:query].context.namespace(CONTEXT_NAMESPACE)
-        query_start_time_monotonic = ns[GraphQL::Metrics::QUERY_START_TIME_MONOTONIC]
+        offset_time = ns[GraphQL::Metrics::QUERY_START_TIME_MONOTONIC]
+        start_time = GraphQL::Metrics.current_time_monotonic
 
-        timed_result = GraphQL::Metrics.time(query_start_time_monotonic) { yield }
+        result = yield
+
+        duration = GraphQL::Metrics.current_time_monotonic - start_time
+        time_since_offset = start_time - offset_time if offset_time
 
         path_excluding_numeric_indicies = data[:path].select { |p| p.is_a?(String) }
         ns[context_key][path_excluding_numeric_indicies] ||= []
         ns[context_key][path_excluding_numeric_indicies] << {
-          start_time_offset: timed_result.time_since_offset, duration: timed_result.duration
+          start_time_offset: time_since_offset, duration: duration
         }
 
-        timed_result.result
+        result
       end
     end
   end

data/lib/graphql/metrics/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module Metrics
-    VERSION = "5.0.0"
+    VERSION = "5.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-metrics
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.2
 platform: ruby
 authors:
 - Christopher Butcher
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -201,6 +201,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/cla.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop-http---shopify-github-io-ruby-style-guide-rubocop-yml"
@@ -215,18 +216,19 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/graphql_1.13.gemfile
+- gemfiles/graphql_2.0.gemfile
 - graphql_metrics.gemspec
 - lib/graphql/metrics.rb
 - lib/graphql/metrics/analyzer.rb
 - lib/graphql/metrics/instrumentation.rb
 - lib/graphql/metrics/tracer.rb
 - lib/graphql/metrics/version.rb
-- service.yml
 homepage: https://github.com/Shopify/graphql-metrics
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -241,8 +243,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: GraphQL Metrics Extractor
 test_files: []

data/service.yml

@@ -1 +0,0 @@
-classification: library