graphql-hive 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa05eaf88fa4240d8ee2364b48a2b7152eec226c2d657156a87efdb5f98eb2c3
-  data.tar.gz: 72e529bf8227f49d5a6c3602c5375feee671263f0e3df31c6b60cd034aff0910
+  metadata.gz: b4c1afad31aef320c5c3994eeadba81a4e87fcf92c44f7bb3a1a1559ff1e3429
+  data.tar.gz: 604b0f65a3292a15154fb4f3808b4cf62f7d31d9a8c157c920d4882988ece36f
 SHA512:
-  metadata.gz: 3669a7e7bedabc6b8dfd3b471fa921bfb34aafed0a5fcc927baca80d55766903ff9ea7aad55460cb72ab8fd38d3f54cf91b1ef345ddb7789048b7c898f4b36fd
-  data.tar.gz: 003c658d94088ea6f89b4a37b2124f907fad3240bf9e2150fffe5ca62d9e2d78ab096f7fe6363e2b7a361f82e7fb2a711c3670ce5e8477986cacae5c8991fbb4
+  metadata.gz: 3a6e1de7d61c15382ab4270769f8f9e6647dadb58d6eeffe9c042663cc448cb0c263ef79dbeed85db220abb1c8b97e54df1a0fadba8f550538b0b6ce489eb83d
+  data.tar.gz: bd16af0fba744194dd093cef087f1bb04c4170a7f4d491939e6ceb8f4d0fc380e179ce7b0b721c655e2f606f463f82da0945df0308572c4c46fd20d8f5176608

data/.github/workflows/ci.yml

@@ -8,33 +8,26 @@ on:
       - master
 
 jobs:
-  rubocop:
+  standard:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-
-    - uses: ruby/setup-ruby@2a9a743e19810b9f3c38060637daf594dbd7b37f
-      with:
-        ruby-version: '3.3'
-        bundler-cache: true
-
-    - run: bundle exec rake rubocop
-      
+      - name: Standard Ruby
+        uses: standardrb/standard-ruby-action@v1
   test:
     strategy:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.1'
-          - '3.2'
-          - '3.3'
+          - "3.1"
+          - "3.2"
+          - "3.3"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-    - uses: ruby/setup-ruby@2a9a743e19810b9f3c38060637daf594dbd7b37f
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true
+      - uses: ruby/setup-ruby@2a9a743e19810b9f3c38060637daf594dbd7b37f
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
 
-    - run: bundle exec rake spec
+      - run: bundle exec rake spec

data/.gitignore

@@ -11,3 +11,9 @@
 .rspec_status
 *.gem
 k6/node_modules/
+
+# IDEs
+.idea
+
+# k6
+node_modules

data/.rubocop.yml

@@ -1,41 +1,10 @@
-AllCops:
-  TargetRubyVersion: 2.6
-  NewCops: enable
-  Exclude:
-    - 'examples/**/*'
-    - 'k6/**/*'
-    - 'gemfiles/**/*'
-    - 'tmp/**/*'
-    - 'vendor/**/*'
-
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*'
-
-Layout/LineLength:
-  Exclude:
-    - 'spec/**/*'
-
-Naming/FileName:
-  Enabled: false
-
-Style/ClassVars:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Gemspec/DevelopmentDependencies:
-  EnforcedStyle: 'gemspec'
+require:
+  - standard
+  - standard-custom
+  - standard-performance
+  - rubocop-performance
+
+inherit_gem:
+  standard: config/base.yml
+  standard-custom: config/base.yml
+  standard-performance: config/base.yml

data/Gemfile

@@ -1,8 +1,15 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in graphql-hive.gemspec
 gemspec
+
+group :development do
+  gem "bundler", "~> 2"
+  gem "rake", "~> 13"
+  gem "rspec", "~> 3"
+  gem "standardrb", "~> 1"
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql-hive (0.4.1)
+    graphql-hive (0.5.0)
       graphql (>= 2.3, < 3)
 
 GEM
@@ -14,16 +14,16 @@ GEM
       base64
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    parallel (1.25.1)
-    parser (3.3.3.0)
+    lint_roller (1.1.0)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    racc (1.8.0)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
-    rexml (3.3.1)
-      strscan
+    rexml (3.3.8)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -37,22 +37,38 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.64.1)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
+    rubocop-performance (1.21.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
-    strscan (3.1.0)
-    unicode-display_width (2.5.0)
+    standard (1.40.1)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.65.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.4)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.4.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.21.0)
+    standardrb (1.0.1)
+      standard
+    unicode-display_width (2.6.0)
 
 PLATFORMS
   arm64-darwin-23
@@ -63,7 +79,7 @@ DEPENDENCIES
   graphql-hive!
   rake (~> 13)
   rspec (~> 3)
-  rubocop (~> 1)
+  standardrb (~> 1)
 
 BUNDLED WITH
    2.5.15

data/README.md

@@ -154,9 +154,9 @@ class MySchema < GraphQL::Schema
       debug: false, # verbose logs
       logger: MyLogger.new,
       endpoint: 'app.graphql-hive.com',
-      port: 80, 
-      buffer_size: 50, # forward the operations data to Hive every 50 requests
-
+      port: 80,
+      buffer_size: 50, # how many operations can be sent to hive in a single batch (AFTER sampling)
+      
       collect_usage: true, # report usage to Hive
       collect_usage_sampling: {
         # optional members of `collect_usage_sampling`  
@@ -164,8 +164,7 @@ class MySchema < GraphQL::Schema
         sampler: proc { |context| context.operation_name.includes?('someQuery') 1 : 0.5 }, # assign custom sampling rates (overrides `sampling rate`)
         at_least_once: true, # sample every distinct operation at least once
         key_generator: proc { |context| context.operation_name } # assign custom keys to distinguish between distinct operations
-      }
-
+      },
       report_schema: true,  # publish schema to Hive
       # mandatory if `report_schema: true`
       reporting: { 

data/Rakefile

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-require 'rubocop/rake_task'
+require "rubocop/rake_task"
 RuboCop::RakeTask.new
 
 task(default: %i[spec rubocop])

data/examples/simple-api/Gemfile

@@ -1,8 +1,8 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'graphql'
-gem 'graphql-hive', path: '../../'
-gem 'puma'
-gem 'rack-contrib'
-gem 'sinatra'
-gem 'sinatra-contrib'
+gem "graphql"
+gem "graphql-hive", path: "../../"
+gem "puma"
+gem "rack-contrib"
+gem "sinatra"
+gem "sinatra-contrib"

data/examples/simple-api/app.rb

@@ -1,8 +1,8 @@
-require 'sinatra'
-require 'sinatra/json'
-require 'rack/contrib'
+require "sinatra"
+require "sinatra/json"
+require "rack/contrib"
 
-require_relative 'schema'
+require_relative "schema"
 
 # Test query:
 #
@@ -16,14 +16,14 @@ require_relative 'schema'
 class DemoApp < Sinatra::Base
   use Rack::JSONBodyParser
 
-  post '/graphql' do
+  post "/graphql" do
     result = Schema.execute(
-      params['query'],
+      params["query"],
       variables: params[:variables],
       operation_name: params[:operationName],
       context: {
-        client_name: 'GraphQL Client',
-        client_version: '1.0'
+        client_name: "GraphQL Client",
+        client_version: "1.0"
       }
     )
     json result

data/examples/simple-api/config.ru

@@ -1,2 +1,2 @@
-require './app'
+require "./app"
 run DemoApp

data/examples/simple-api/schema.rb

@@ -1,9 +1,9 @@
-require 'graphql'
-require 'graphql-hive'
+require "graphql"
+require "graphql-hive"
 
 module Types
   class PostType < GraphQL::Schema::Object
-    description 'A blog post'
+    description "A blog post"
     field :id, ID, null: false
     field :title, String, null: false
     # fields should be queried in camel-case (this will be `truncatedPreview`)
@@ -12,29 +12,29 @@ module Types
 end
 
 class Types::PostInput < GraphQL::Schema::InputObject
-  description 'Query Post arguments'
+  description "Query Post arguments"
   argument :id, ID, required: true
 end
 
 class Types::TestEnum < GraphQL::Schema::Enum
-  value 'TEST1'
-  value 'TEST2'
-  value 'TEST3'
+  value "TEST1"
+  value "TEST2"
+  value "TEST3"
 end
 
 class QueryType < GraphQL::Schema::Object
-  description 'The query root of this schema'
+  description "The query root of this schema"
 
   # First describe the field signature:
-  field :post, Types::PostType, 'Find a post by ID' do
+  field :post, Types::PostType, "Find a post by ID" do
     argument :input, [Types::PostInput]
     argument :test, Types::TestEnum
   end
 
   # Then provide an implementation:
   def post(input:, test:)
-    { id: 1, title: 'GraphQL Hive with `graphql-ruby`',
-      truncated_preview: 'Monitor operations, inspect your queries and publish your GraphQL schema with GraphQL Hive' }
+    {id: 1, title: "GraphQL Hive with `graphql-ruby`",
+     truncated_preview: "Monitor operations, inspect your queries and publish your GraphQL schema with GraphQL Hive"}
   end
 end
 
@@ -44,9 +44,9 @@ class Schema < GraphQL::Schema
   use(
     GraphQL::Hive,
     buffer_size: 2,
-    token: 'YOUR_TOKEN',
+    token: "YOUR_TOKEN",
     debug: true,
-    reporting: { author: 'Charly Poly', commit: '109bb1e748bae21bdfe663c0ffc7e830' },
-    client_info: proc { |context|{ name: context[:client_name], version: context[:client_version] }}
+    reporting: {author: "Charly Poly", commit: "109bb1e748bae21bdfe663c0ffc7e830"},
+    client_info: proc { |context| {name: context[:client_name], version: context[:client_version]} }
   )
 end

data/graphql-hive.gemspec

@@ -1,33 +1,28 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'graphql-hive/version'
+require "graphql-hive/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'graphql-hive'
-  spec.version       = Graphql::Hive::VERSION
-  spec.authors       = ['Charly POLY']
-  spec.email         = ['cpoly55@gmail.com']
+  spec.name = "graphql-hive"
+  spec.version = Graphql::Hive::VERSION
+  spec.authors = ["Charly POLY"]
+  spec.email = ["cpoly55@gmail.com"]
 
-  spec.summary       = '"GraphQL Hive integration for `graphql-ruby`"'
-  spec.description   = '"Monitor operations, inspect your queries and publish your GraphQL schema with GraphQL Hive"'
-  spec.homepage      = 'https://docs.graphql-hive.com/specs/integrations'
-  spec.license       = 'MIT'
+  spec.summary = '"GraphQL Hive integration for `graphql-ruby`"'
+  spec.description = '"Monitor operations, inspect your queries and publish your GraphQL schema with GraphQL Hive"'
+  spec.homepage = "https://docs.graphql-hive.com/specs/integrations"
+  spec.license = "MIT"
 
-  spec.metadata      = { 'rubygems_mfa_required' => 'true' }
+  spec.metadata = {"rubygems_mfa_required" => "true"}
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
-  spec.require_paths = ['lib']
-  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
+  spec.require_paths = ["lib"]
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
 
-  spec.add_dependency 'graphql', '>= 2.3', '< 3'
-
-  spec.add_development_dependency 'bundler', '~> 2'
-  spec.add_development_dependency 'rake', '~> 13'
-  spec.add_development_dependency 'rspec', '~> 3'
-  spec.add_development_dependency 'rubocop', '~> 1'
+  spec.add_dependency "graphql", ">= 2.3", "< 3"
 end

data/k6/README.md

@@ -0,0 +1,37 @@
+# k6 (Integration Tests)
+
+This directory contains integration tests for the k6 project. In
+summary, this folder does the following:
+1. Start a ruby server, with hive enabled
+2. Start a ruby server, with hive disabled
+3. Start a mock GraphQL Hive `/usage` api
+4. Run GraphQL Requests against the 2 servers
+5. Compare the results
+
+## Prerequisites
+1. Ruby > 3.0.0
+2. Node > 14.0.0
+3. [k6 installed](https://grafana.com/docs/k6/latest/set-up/install-k6/)
+
+## Running the tests (locally)
+
+Start the ruby server with HIVE_ENABLED=true
+```bash
+cd graphql-api
+HIVE_ENABLED=true bundle exec puma -t 0:1 -p 9292
+```
+
+Start the ruby server with HIVE_ENABLED=false
+```bash
+HIVE_ENABLED=false bundle exec puma -t 0:1 -p 9291
+```
+
+Start the usage mock server
+```bash
+node usage-mock.js
+```
+
+Run k6 tests:
+```bash
+k6 run k6.js
+```

data/k6/graphql-api/Gemfile

@@ -1,9 +1,9 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'graphql', '~> 2'
-gem 'graphql-hive', path: '../../'
-gem 'puma', '~> 6'
-gem 'racc'
-gem 'rack-contrib', '~> 2'
-gem 'sinatra', '~> 2'
-gem 'sinatra-contrib'
+gem "graphql", "~> 2"
+gem "graphql-hive", path: "../../"
+gem "puma", "~> 6"
+gem "racc"
+gem "rack-contrib", "~> 2"
+gem "sinatra", "~> 2"
+gem "sinatra-contrib"

data/k6/graphql-api/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    graphql-hive (0.4.1)
+    graphql-hive (0.5.0)
       graphql (>= 2.3, < 3)
 
 GEM

data/k6/graphql-api/app.rb

@@ -1,24 +1,24 @@
-require 'sinatra'
-require 'sinatra/json'
-require 'rack/contrib'
+require "sinatra"
+require "sinatra/json"
+require "rack/contrib"
 
-require_relative 'schema'
+require_relative "schema"
 
 class DemoApp < Sinatra::Base
   use Rack::JSONBodyParser
 
-  get '/' do
+  get "/" do
     status 200
   end
 
-  post '/graphql' do
+  post "/graphql" do
     result = Schema.execute(
-      params['query'],
+      params["query"],
       variables: params[:variables],
       operation_name: params[:operationName],
       context: {
-        client_name: 'GraphQL Client',
-        client_version: '1.0'
+        client_name: "GraphQL Client",
+        client_version: "1.0"
       }
     )
     json result

data/k6/graphql-api/config.ru

@@ -1,2 +1,2 @@
-require './app'
+require "./app"
 run DemoApp

data/k6/graphql-api/schema.rb

@@ -1,9 +1,9 @@
-require 'graphql'
-require 'graphql-hive'
+require "graphql"
+require "graphql-hive"
 
 module Types
   class PostType < GraphQL::Schema::Object
-    description 'A blog post'
+    description "A blog post"
     field :id, ID, null: false
     field :title, String, null: false
     # fields should be queried in camel-case (this will be `truncatedPreview`)
@@ -12,17 +12,17 @@ module Types
 end
 
 class QueryType < GraphQL::Schema::Object
-  description 'The query root of this schema'
+  description "The query root of this schema"
 
   # First describe the field signature:
-  field :post, Types::PostType, 'Find a post by ID' do
+  field :post, Types::PostType, "Find a post by ID" do
     argument :id, [ID]
   end
 
   # Then provide an implementation:
   def post(id:)
-    { id: 1, title: 'GraphQL Hive with `graphql-ruby`',
-      truncated_preview: 'Monitor operations, inspect your queries and publish your GraphQL schema with GraphQL Hive' }
+    {id: 1, title: "GraphQL Hive with `graphql-ruby`",
+     truncated_preview: "Monitor operations, inspect your queries and publish your GraphQL schema with GraphQL Hive"}
   end
 end
 
@@ -31,11 +31,11 @@ class Schema < GraphQL::Schema
 
   use(
     GraphQL::Hive,
-    enabled: ENV['HIVE_ENABLED'] === 'true',
-    endpoint: 'localhost',
+    enabled: ENV["HIVE_ENABLED"] === "true",
+    endpoint: "localhost",
     debug: true,
     port: 8888,
-    token: 'stress-token',
+    token: "stress-token",
     report_schema: false
   )
 end

data/lib/graphql-hive/analyzer.rb

@@ -73,7 +73,7 @@ module GraphQL
       end
 
       def make_id(*tokens)
-        tokens.join('.')
+        tokens.join(".")
       end
     end
   end

data/lib/graphql-hive/bounded_queue.rb

@@ -0,0 +1,26 @@
+module GraphQL
+  class Hive < GraphQL::Tracing::PlatformTracing
+    # BoundedQueue is being used so that the queue does not grow indefinitely
+    # We do not use `SizedQueue` because it blocks the thread when the queue is full with a .wait call
+    # This would go against us not impacting the application performance with the usage reporter
+    class BoundedQueue < Thread::Queue
+      def initialize(bound:, logger:)
+        @bound = bound
+        @logger = logger
+        @lock = Mutex.new
+
+        super()
+      end
+
+      def push(item)
+        @lock.synchronize do
+          if size >= @bound
+            @logger.error("BoundedQueue is full, discarding operation")
+            return
+          end
+          super
+        end
+      end
+    end
+  end
+end

data/lib/graphql-hive/client.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'net/http'
-require 'uri'
+require "net/http"
+require "uri"
 
 module GraphQL
   class Hive < GraphQL::Tracing::PlatformTracing
@@ -14,9 +14,9 @@ module GraphQL
       def send(path, body, _log_type)
         uri =
           URI::HTTP.build(
-            scheme: @options[:port].to_s == '443' ? 'https' : 'http',
-            host: @options[:endpoint] || 'app.graphql-hive.com',
-            port: @options[:port] || '443',
+            scheme: (@options[:port].to_s == "443") ? "https" : "http",
+            host: @options[:endpoint] || "app.graphql-hive.com",
+            port: @options[:port] || "443",
             path: path
           )
 
@@ -26,26 +26,25 @@ module GraphQL
 
         @options[:logger].debug(response.inspect)
         @options[:logger].debug(response.body.inspect)
-      rescue StandardError => e
+      rescue => e
         @options[:logger].fatal("Failed to send data: #{e}")
-        raise e
       end
 
       def setup_http(uri)
         http = ::Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = @options[:port].to_s == '443'
+        http.use_ssl = @options[:port].to_s == "443"
         http.read_timeout = 2
         http
       end
 
       def build_request(uri, body)
         request = Net::HTTP::Post.new(uri.request_uri)
-        request['Authorization'] = @options[:token]
-        request['X-Usage-API-Version'] = '2'
-        request['content-type'] = 'application/json'
-        request['User-Agent'] = "Hive@#{Graphql::Hive::VERSION}"
-        request['graphql-client-name'] = 'Hive Ruby Client'
-        request['graphql-client-version'] = Graphql::Hive::VERSION
+        request["Authorization"] = @options[:token]
+        request["X-Usage-API-Version"] = "2"
+        request["content-type"] = "application/json"
+        request["User-Agent"] = "Hive@#{Graphql::Hive::VERSION}"
+        request["graphql-client-name"] = "Hive Ruby Client"
+        request["graphql-client-version"] = Graphql::Hive::VERSION
         request.body = JSON.generate(body)
         request
       end

data/lib/graphql-hive/printer.rb

@@ -10,12 +10,12 @@ module GraphQL
         @out.append(str)
       end
 
-      def print_node(node, indent: '')
+      def print_node(node, indent: "")
         case node
         when Float, Integer
-          print_string '0'
+          print_string "0"
         when String
-          print_string ''
+          print_string ""
         else
           super
         end
@@ -23,16 +23,16 @@ module GraphQL
 
       # from GraphQL::Language::Printer with sort_by name
       # ignores aliases
-      def print_field(field, indent: '')
+      def print_field(field, indent: "")
         print_string(indent)
         print_string(field.name)
         if field.arguments.any?
-          print_string('(')
+          print_string("(")
           field.arguments.sort_by(&:name).each_with_index do |a, i|
             print_argument(a)
-            print_string(', ') if i < field.arguments.size - 1
+            print_string(", ") if i < field.arguments.size - 1
           end
-          print_string(')')
+          print_string(")")
         end
         print_directives(field.directives)
         print_selections(field.selections, indent: indent)
@@ -43,7 +43,7 @@ module GraphQL
       end
 
       # from GraphQL::Language::Printer with sort_by name
-      def print_selections(selections, indent: '')
+      def print_selections(selections, indent: "")
         sorted_nodes = selections.sort_by do |s|
           next s.name if s.respond_to?(:name)
           next s.type.name if s.respond_to?(:type)
@@ -55,35 +55,35 @@ module GraphQL
 
       # from GraphQL::Language::Printer with sort_by name
       def print_directive(directive)
-        print_string('@')
+        print_string("@")
         print_string(directive.name)
 
         return if directive.arguments.blank?
 
-        print_string('(')
+        print_string("(")
         directive.arguments.sort_by(&:name).each_with_index do |a, i|
           print_argument(a)
-          print_string(', ') if i < directive.arguments.size - 1
+          print_string(", ") if i < directive.arguments.size - 1
         end
-        print_string(')')
+        print_string(")")
       end
 
       # from GraphQL::Language::Printer with sort_by name
-      def print_operation_definition(operation_definition, indent: '')
+      def print_operation_definition(operation_definition, indent: "")
         print_string(indent)
         print_string(operation_definition.operation_type)
         if operation_definition.name
-          print_string(' ')
+          print_string(" ")
           print_string(operation_definition.name)
         end
 
         if operation_definition.variables.any?
-          print_string('(')
+          print_string("(")
           operation_definition.variables.sort_by(&:name).each_with_index do |v, i|
             print_variable_definition(v)
-            print_string(', ') if i < operation_definition.variables.size - 1
+            print_string(", ") if i < operation_definition.variables.size - 1
           end
-          print_string(')')
+          print_string(")")
         end
 
         print_directives(operation_definition.directives)

data/lib/graphql-hive/sampler.rb

@@ -8,28 +8,28 @@ module GraphQL
         # backwards compatibility with old `collect_usage_sampling` field
         if sampling_options.is_a?(Numeric)
           logger&.warn(
-            '`collect_usage_sampling` is deprecated for fixed sampling rates, ' \
-            'use `collect_usage_sampling: { sample_rate: XX }` instead'
+            "`collect_usage_sampling` is deprecated for fixed sampling rates, " \
+            "use `collect_usage_sampling: { sample_rate: XX }` instead"
           )
           passed_sampling_rate = sampling_options
-          sampling_options = { sample_rate: passed_sampling_rate }
+          sampling_options = {sample_rate: passed_sampling_rate}
         end
 
         sampling_options ||= {}
 
         @sampler = if sampling_options[:sampler]
-                     Sampling::DynamicSampler.new(
-                       sampling_options[:sampler],
-                       sampling_options[:at_least_once],
-                       sampling_options[:key_generator]
-                     )
-                   else
-                     Sampling::BasicSampler.new(
-                       sampling_options[:sample_rate],
-                       sampling_options[:at_least_once],
-                       sampling_options[:key_generator]
-                     )
-                   end
+          Sampling::DynamicSampler.new(
+            sampling_options[:sampler],
+            sampling_options[:at_least_once],
+            sampling_options[:key_generator]
+          )
+        else
+          Sampling::BasicSampler.new(
+            sampling_options[:sample_rate],
+            sampling_options[:at_least_once],
+            sampling_options[:key_generator]
+          )
+        end
       end
 
       def sample?(operation)

data/lib/graphql-hive/sampling/basic_sampler.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'graphql-hive/sampling/sampling_context'
+require "graphql-hive/sampling/sampling_context"
 
 module GraphQL
   class Hive

data/lib/graphql-hive/sampling/dynamic_sampler.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'graphql-hive/sampling/sampling_context'
+require "graphql-hive/sampling/sampling_context"
 
 module GraphQL
   class Hive

data/lib/graphql-hive/sampling/sampling_context.rb

@@ -16,7 +16,7 @@ module GraphQL
         def get_sample_context(operation)
           _, queries, results, = operation
 
-          operation_name = queries.map(&:operations).map(&:keys).flatten.compact.join(', ')
+          operation_name = queries.map(&:operations).map(&:keys).flatten.compact.join(", ")
 
           parsed_definitions = []
           queries.each do |query|

data/lib/graphql-hive/usage_reporter.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require 'digest'
-require 'graphql-hive/analyzer'
-require 'graphql-hive/printer'
+require "digest"
+require "graphql-hive/analyzer"
+require "graphql-hive/printer"
+require "graphql-hive/bounded_queue"
 
 module GraphQL
   class Hive < GraphQL::Tracing::PlatformTracing
@@ -16,14 +17,11 @@ module GraphQL
 
       def initialize(options, client)
         @@instance = self
-
         @options = options
         @client = client
-
         @options_mutex = Mutex.new
-        @queue = Queue.new
-
         @sampler = Sampler.new(options[:collect_usage_sampling], options[:logger]) # NOTE: logs for deprecated field
+        @queue = BoundedQueue.new(bound: options[:buffer_size], logger: options[:logger])
 
         start_thread
       end
@@ -45,36 +43,38 @@ module GraphQL
 
       def start_thread
         if @thread&.alive?
-          @options[:logger].warn('Tried to start operations flushing thread but it was already alive')
+          @options[:logger].warn("Tried to start operations flushing thread but it was already alive")
           return
         end
 
         @thread = Thread.new do
           buffer = []
           while (operation = @queue.pop(false))
-            @options[:logger].debug("processing operation from queue: #{operation}")
-            buffer << operation if @sampler.sample?(operation)
-
-            @options_mutex.synchronize do
-              if buffer.size >= @options[:buffer_size]
-                @options[:logger].debug('buffer is full, sending!')
-                process_operations(buffer)
-                buffer = []
+            begin
+              @options[:logger].debug("processing operation from queue: #{operation}")
+              buffer << operation if @sampler.sample?(operation)
+
+              @options_mutex.synchronize do
+                if buffer.size >= @options[:buffer_size]
+                  @options[:logger].debug("buffer is full, sending!")
+                  process_operations(buffer)
+                  buffer = []
+                end
               end
+            rescue => e
+              buffer = []
+              @options[:logger].error(e)
             end
           end
 
           unless buffer.empty?
-            @options[:logger].debug('shuting down with buffer, sending!')
+            @options[:logger].debug("shuting down with buffer, sending!")
             process_operations(buffer)
           end
-        rescue StandardError => e
+        rescue => e
           # ensure configured logger receives exception as well in setups where STDERR might not be
           # monitored.
-          @options[:logger].error('GraphQL Hive usage collection thread terminating')
           @options[:logger].error(e)
-
-          raise e
         end
       end
 
@@ -91,7 +91,7 @@ module GraphQL
 
         @options[:logger].debug("sending report: #{report}")
 
-        @client.send('/usage', report, :usage)
+        @client.send(:"/usage", report, :usage)
       end
 
       def add_operation_to_report(report, operation)
@@ -99,8 +99,8 @@ module GraphQL
 
         errors = errors_from_results(results)
 
-        operation_name = queries.map(&:operations).map(&:keys).flatten.compact.join(', ')
-        operation = ''
+        operation_name = queries.map(&:operations).map(&:keys).flatten.compact.join(", ")
+        operation = ""
         fields = Set.new
 
         queries.each do |query|
@@ -134,7 +134,7 @@ module GraphQL
 
         if results[0]
           context = results[0].query.context
-          operation_record[:metadata] = { client: @options[:client_info].call(context) } if @options[:client_info]
+          operation_record[:metadata] = {client: @options[:client_info].call(context)} if @options[:client_info]
         end
 
         report[:map][operation_map_key] = {
@@ -147,9 +147,9 @@ module GraphQL
       end
 
       def errors_from_results(results)
-        acc = { errorsTotal: 0 }
+        acc = {errorsTotal: 0}
         results.each do |result|
-          errors = result.to_h.fetch('errors', [])
+          errors = result.to_h.fetch("errors", [])
           errors.each do
             acc[:errorsTotal] += 1
           end

data/lib/graphql-hive/version.rb

@@ -2,6 +2,6 @@
 
 module Graphql
   module Hive
-    VERSION = '0.4.1'
+    VERSION = "0.5.0"
   end
 end

data/lib/graphql-hive.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'logger'
-require 'securerandom'
+require "logger"
+require "securerandom"
 
-require 'graphql-hive/version'
-require 'graphql-hive/usage_reporter'
-require 'graphql-hive/client'
+require "graphql-hive/version"
+require "graphql-hive/usage_reporter"
+require "graphql-hive/client"
 
-require 'graphql-hive/sampler'
-require 'graphql-hive/sampling/basic_sampler'
-require 'graphql-hive/sampling/dynamic_sampler'
+require "graphql-hive/sampler"
+require "graphql-hive/sampling/basic_sampler"
+require "graphql-hive/sampling/dynamic_sampler"
 
 module GraphQL
   # GraphQL Hive usage collector and schema reporter
@@ -31,7 +31,7 @@ module GraphQL
     DEFAULT_OPTIONS = {
       enabled: true,
       debug: false,
-      port: '443',
+      port: "443",
       collect_usage: true,
       read_operations: true,
       report_schema: true,
@@ -41,14 +41,14 @@ module GraphQL
     }.freeze
 
     self.platform_keys = {
-      'lex' => 'lex',
-      'parse' => 'parse',
-      'validate' => 'validate',
-      'analyze_query' => 'analyze_query',
-      'analyze_multiplex' => 'analyze_multiplex',
-      'execute_multiplex' => 'execute_multiplex',
-      'execute_query' => 'execute_query',
-      'execute_query_lazy' => 'execute_query_lazy'
+      "lex" => "lex",
+      "parse" => "parse",
+      "validate" => "validate",
+      "analyze_query" => "analyze_query",
+      "analyze_multiplex" => "analyze_multiplex",
+      "execute_multiplex" => "execute_multiplex",
+      "execute_query" => "execute_query",
+      "execute_query_lazy" => "execute_query_lazy"
     }
 
     def initialize(options = {})
@@ -84,7 +84,7 @@ module GraphQL
     def platform_trace(platform_key, _key, data)
       return yield unless @options[:enabled] && @options[:collect_usage]
 
-      if platform_key == 'execute_multiplex'
+      if platform_key == "execute_multiplex"
         if data[:multiplex]
           queries = data[:multiplex].queries
           timestamp = (Time.now.utc.to_f * 1000).to_i
@@ -134,25 +134,26 @@ module GraphQL
         options[:logger] = Logger.new($stderr)
         original_formatter = Logger::Formatter.new
         options[:logger].formatter = proc { |severity, datetime, progname, msg|
-          original_formatter.call(severity, datetime, progname, "[hive] #{msg.dump}")
+          msg = msg.respond_to?(:dump) ? msg.dump : msg
+          original_formatter.call(severity, datetime, progname, "[hive] #{msg}")
         }
         options[:logger].level = options[:debug] ? Logger::DEBUG : Logger::INFO
       end
       if !options.include?(:token) && (!options.include?(:enabled) || options.enabled)
-        options[:logger].warn('`token` options is missing')
+        options[:logger].warn("`token` options is missing")
         options[:enabled] = false
         false
       elsif options[:report_schema] &&
+          (
+            !options.include?(:reporting) ||
             (
-              !options.include?(:reporting) ||
-              (
-                options.include?(:reporting) && (
-                  !options[:reporting].include?(:author) || !options[:reporting].include?(:commit)
-                )
+              options.include?(:reporting) && (
+                !options[:reporting].include?(:author) || !options[:reporting].include?(:commit)
               )
             )
+          )
 
-        options[:logger].warn('`reporting.author` and `reporting.commit` options are required')
+        options[:logger].warn("`reporting.author` and `reporting.commit` options are required")
         false
       end
       true
@@ -167,7 +168,7 @@ module GraphQL
 
       body = {
         query: REPORT_SCHEMA_MUTATION,
-        operationName: 'schemaPublish',
+        operationName: "schemaPublish",
         variables: {
           input: {
             sdl: sdl,
@@ -180,7 +181,7 @@ module GraphQL
         }
       }
 
-      @client.send('/registry', body, :'report-schema')
+      @client.send(:"/registry", body, :"report-schema")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-hive
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Charly POLY
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-26 00:00:00.000000000 Z
+date: 2024-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -30,62 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 description: '"Monitor operations, inspect your queries and publish your GraphQL schema
   with GraphQL Hive"'
 email:
@@ -112,6 +56,7 @@ files:
 - examples/simple-api/config.ru
 - examples/simple-api/schema.rb
 - graphql-hive.gemspec
+- k6/README.md
 - k6/graphql-api/Gemfile
 - k6/graphql-api/Gemfile.lock
 - k6/graphql-api/app.rb
@@ -123,6 +68,7 @@ files:
 - k6/yarn.lock
 - lib/graphql-hive.rb
 - lib/graphql-hive/analyzer.rb
+- lib/graphql-hive/bounded_queue.rb
 - lib/graphql-hive/client.rb
 - lib/graphql-hive/printer.rb
 - lib/graphql-hive/sampler.rb