graphql-metrics 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a07023fbdc4beff81a392ca7dc3ae2e5c413807be91121b49ad05bb63e9f9a20
-  data.tar.gz: c8c533731167efe52c0da74f1d5ee147bd69efb9e3c2eedd0a7a7302d956a187
+  metadata.gz: 315fadbeefcfba11dcde6e9f60786b414c6351e891800ac908bd491b40a50ecd
+  data.tar.gz: cae83709e2add17cf2534486932c504d216784402fae02c994afd911d0bb42be
 SHA512:
-  metadata.gz: e6f0d75f489119e17d55fc83d8bfe0aa0601ccb54dc5fa5e97fa435746b130ffe5dd1f95114be8c40c44f6350b2357381986c3602e317c7c76b10bc98b233c7e
-  data.tar.gz: 35613ab78775485ede19e0ba178f7151e2239b091e4b7832e9fcba06c7c97cba7cecddea05042cad131f426c877e96156a54cc91afee2d4c5e33973673f7bb3a
+  metadata.gz: f9e9b56eabf8f9993501b9bf805c05515ba5bba50e908f1aa10c205534208f1b60b6da90c3a2e951bb08fa6387860089decca0bcaea0b87649a5d42e5842cc6c
+  data.tar.gz: 3a513f4d6f25732972db556526bba42884ef41389cee0f372a0bd373ce71853889ea70e4cad5c042ad3956f3ea4e22cbbc1d5871f9d340e6e433499a7ffbbde2

data/.github/dependabot.yml

@@ -11,6 +11,10 @@ registries:
     username: ${{secrets.DEPENDENCIES_GITHUB_USER}}
     password: ${{secrets.DEPENDENCIES_GITHUB_TOKEN}}
 updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly
   - package-ecosystem: bundler
     directory: "/"
     schedule:

data/.github/workflows/dependabot_auto_merge.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2
+        uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3.1.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs

data/.github/workflows/release.yml

@@ -0,0 +1,52 @@
+name: Release gem on RubyGems.org and create GitHub release
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  release_gem:
+    name: Release gem on RubyGems.org
+    if: github.repository == 'Shopify/graphql-metrics'
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      id-token: write
+
+    environment: release
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@b3aaceaef7e0ee231b499e7b5f49c03fc1d32199 # v1.338.0
+        with:
+          bundler-cache: true
+
+      - name: Release gem on RubyGems.org
+        uses: rubygems/release-gem@7f9650160c1a4e7989fdc9855807bdbd421d8b6b # v1.4.1
+
+  release_github:
+    name: Create GitHub release
+    if: github.repository == 'Shopify/graphql-metrics'
+    needs: release_gem
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - name: Create GitHub release
+        run: gh release create "${GITHUB_REF_NAME}" --verify-tag --generate-notes
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/ruby.yml

@@ -10,14 +10,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
+        ruby: ['3.3', '3.4', '4.0']
         gemfile: ['graphql_2.3', 'graphql_head']
     runs-on: ${{ matrix.os }}
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@v1
+    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+    - uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true

data/.ruby-version

@@ -1 +1 @@
-3.3.1
+4.0.9

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+6.0.1
+-----
+- [149](https://github.com/Shopify/graphql-metrics/pull/149) Require Ruby 3.3 or newer
+- [110](https://github.com/Shopify/graphql-metrics/pull/110) Fix missing `parent_input_object_type` in nested input object metrics
+
 6.0.0
 -----
 

data/Gemfile.lock

@@ -1,65 +1,66 @@
 PATH
   remote: .
   specs:
-    graphql-metrics (6.0.0)
+    graphql-metrics (6.0.1)
       graphql (>= 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    base64 (0.2.0)
-    byebug (11.1.3)
+    base64 (0.3.0)
+    byebug (13.0.0)
+      reline (>= 0.6.0)
     coderay (1.1.3)
-    concurrent-ruby (1.2.3)
-    diffy (3.4.2)
+    diffy (3.4.3)
+    drb (2.2.3)
     fakeredis (0.9.2)
       redis (~> 4.8)
-    graphql (2.3.0)
+    fiber-storage (1.0.1)
+    graphql (2.4.18)
       base64
+      fiber-storage
+      logger
     graphql-batch (0.6.0)
       graphql (>= 1.12.18, < 3)
       promise.rb (~> 0.7.2)
-    hashdiff (1.1.0)
-    i18n (1.14.4)
-      concurrent-ruby (~> 1.0)
-    method_source (1.0.0)
-    minitest (5.22.3)
-    minitest-focus (1.4.0)
-      minitest (>= 4, < 6)
-    mocha (2.1.0)
+    hashdiff (1.1.2)
+    io-console (0.9.5)
+    logger (1.7.0)
+    method_source (1.1.0)
+    minitest (6.1.0)
+      drb (~> 2.0)
+      prism (>= 1.5, < 3)
+    minitest-focus (1.4.1)
+      minitest (> 5.0)
+    mocha (2.7.1)
       ruby2_keywords (>= 0.0.5)
+    prism (2.1.0-arm64-darwin)
+    prism (2.1.0-x86_64-linux-gnu)
     promise.rb (0.7.4)
-    pry (0.14.2)
+    pry (0.16.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.10.1)
-      byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
-    rake (13.1.0)
+      reline (>= 0.6.0)
+    pry-byebug (3.12.0)
+      byebug (~> 13.0)
+      pry (>= 0.13, < 0.17)
+    rake (13.2.1)
     redis (4.8.1)
+    reline (0.7.0)
+      io-console (~> 0.5)
     ruby2_keywords (0.0.5)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.13)
 
 PLATFORMS
   arm64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
-  activesupport (~> 6.1.7)
   diffy
   fakeredis
   graphql-batch
   graphql-metrics!
   hashdiff
-  minitest (~> 5.0)
+  minitest (~> 6.0)
   minitest-focus
   mocha
   pry

data/RELEASING

@@ -2,14 +2,14 @@ Releasing graphql-metrics
 
 1. Check the Semantic Versioning page for info on how to version the new release: http://semver.org
 2. Update VERSION in lib/graphql/metrics/version.rb
-3. Add a CHANGELOG entry for the new release
-4. Commit the changes with a commit message like "Packaging for release X.Y.Z"
-5. Tag the release with the version (Leave REV blank for HEAD or provide a SHA)
-  $ git tag vX.Y.Z REV
-6. Push out the changes
-  $ git push
-7. Push out the tags
-  $ git push --tags
-8. Publish the gem
-  $ gem build graphql_metrics.gemspec
-  $ gem push graphql-metrics-X.Y.Z.gem
+3. Run `bundle install` so Gemfile.lock picks up the new version
+4. Add a CHANGELOG entry for the new release
+5. Open a pull request with a title like "Packaging for release X.Y.Z" and merge it
+6. Tag the merge commit on main with the version and push the tag
+  $ git checkout main && git pull
+  $ git tag vX.Y.Z
+  $ git push origin vX.Y.Z
+
+Pushing the tag runs the Release workflow (.github/workflows/release.yml),
+which publishes the gem to RubyGems.org with trusted publishing and creates
+a GitHub release with generated notes. No RubyGems API key is needed.

data/graphql_metrics.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/Shopify/graphql-metrics'
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.3"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
@@ -27,9 +27,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "graphql", ">= 2.3"
   spec.add_development_dependency "rake", "~> 13.2"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "minitest", "~> 6.0"
   spec.add_development_dependency 'graphql-batch'
-  spec.add_development_dependency "activesupport", "~> 6.1.7"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "mocha"

data/lib/graphql/metrics/analyzer.rb

@@ -130,10 +130,19 @@ module GraphQL
             parent_input_object: parent_input_object,
             parent: parent
           )
+
+          # For nested InputObject arguments, we need to pass the InputObject type as the parent
+          # for its child fields to be properly attributed
+          parent_for_nested_fields = if argument.value.is_a?(::GraphQL::Schema::InputObject)
+            argument.value.class
+          else
+            parent_input_object
+          end
+
           extract_arguments(
-            argument:argument.value,
+            argument: argument.value,
             definition: definition,
-            parent_input_object: parent_input_object,
+            parent_input_object: parent_for_nested_fields,
             parent: parent
           )
         when ::GraphQL::Schema::InputObject

data/lib/graphql/metrics/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module Metrics
-    VERSION = "6.0.0"
+    VERSION = "6.0.1"
   end
 end

data/lib/graphql/metrics.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "graphql/metrics/version"
-require "graphql/metrics/instrumentation"
-require "graphql/metrics/trace"
-require "graphql/metrics/analyzer"
+require_relative "metrics/version"
+require_relative "metrics/instrumentation"
+require_relative "metrics/trace"
+require_relative "metrics/analyzer"
 
 module GraphQL
   module Metrics

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: graphql-metrics
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Christopher Butcher
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -44,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: graphql-batch
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +65,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.7
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +175,7 @@ files:
 - ".github/dependabot.yml"
 - ".github/workflows/cla.yml"
 - ".github/workflows/dependabot_auto_merge.yml"
+- ".github/workflows/release.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop-http---shopify-github-io-ruby-style-guide-rubocop-yml"
@@ -218,7 +204,6 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -226,15 +211,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
-signing_key:
+rubygems_version: 4.0.20
 specification_version: 4
 summary: GraphQL Metrics Extractor
 test_files: []