infield 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5a5b72da6bbb6200602ff8afba391199669ca5cd265c7b134cc461756b800f1
-  data.tar.gz: 73f0b79b8d207468d166787b0af21461e17d875cc3423744c037046939df602f
+  metadata.gz: 8e38ea40e467d3cbeb1bdffa874079e8e239b5848a0b29c92950af25e29be7cc
+  data.tar.gz: fe0209155165140aa4b0b00c42522fa17140e9b16c0b11a5934efd88e174a0e5
 SHA512:
-  metadata.gz: 834d0d67edfc17821d11782a91672a217533ac6069e86c4b471c873fdf037d2f075c4387ebcc754b2142f6069d5c84ed340057c58b558ea1dfb7dd5d59972067
-  data.tar.gz: 6150e0e43b01658417b237184ee81cfd7f2b7a6eaf78737ff844dfa4b77ac57f93b99f2b18f75aba5ee746303404a4320dcaddd74ebbb2072cb576fbfe21e391
+  metadata.gz: 851bfaa811aa0420cb11e538849e96799f2ea806620c918ee4b883d708a95343ebc4f94845d008d163d788a925037a98c4577bbaa79fd2a5c737b5740979c455
+  data.tar.gz: 883a1530b0d8b9924d2c11d9103e6ac8b0aebcd93586f5a5fd40bbff4451b6f79658c0229d448190acf9795ea3e3c81fbd2ed23a8a8836b51b8daa7df3c9bcdc

data/.ruby-version

@@ -1 +1 @@
-3.2.3
+3.2.3

data/lib/infield/deprecation_warning.rb

@@ -1,35 +1,53 @@
 # frozen_string_literal: true
 
-require 'concurrent/array'
-require 'concurrent/atomic/event'
+require 'thread'
+require 'json'
 require 'net/http'
 
 module Infield
+  # Takes in new deprecation warnings and sends them to the Infield API
+  # in batches
   module DeprecationWarning
     Task = Struct.new(:message, :callstack)
 
+    # Handles spinning up a thread to process work
     module Runner
       class << self
-        def event
-          @event ||= Concurrent::Event.new
-        end
+        attr_reader :queue
 
-        def tasks
-          @tasks ||= Concurrent::Array.new
+        def enqueue(message)
+          return if @queue.size >= @queue_limit
+          @queue << message
         end
 
-        def run
+        def run(sleep_interval: 5, batch_size: 10, queue_limit: 30)
+          @queue ||= Queue.new
+          @sleep_interval = sleep_interval
+          # Queue cannot be larger than this. If more than this number of messages come in
+          # before the next wake interval any extra are dropped
+          @queue_limit = queue_limit
+          @batch_size = batch_size # send up to 20 messages to API at once
+
           Thread.new do
             loop do
-              event.wait
-              deliver
-              event.reset
+              sleep(@sleep_interval)
+              next if @queue.empty?
+
+              process_queue
             end
           end
         end
 
         private
 
+        def process_queue
+          messages = []
+          messages << @queue.pop until @queue.empty?
+          messages.each_slice(@batch_size) do |batch|
+            post_deprecation_warnings(batch)
+          end
+        end
+
         def default_api_params
           { repo_environment_id: Infield.repo_environment_id,
             environment: Infield.environment }
@@ -39,34 +57,27 @@ module Infield
           URI.parse(Infield.infield_api_url)
         end
 
-        def upload_message(task)
+        def post_deprecation_warnings(tasks)
+          messages = tasks.map { |w| { message: w.message } }
           uri = infield_api_uri
           Net::HTTP.start(uri.host, uri.port, use_ssl: (uri.scheme == 'https')) do |http|
             http.post('/api/raw_deprecation_warnings',
-                      default_api_params.merge(message: task.message).to_json,
+                      default_api_params.merge(messages: messages).to_json,
                       { 'Content-Type' => 'application/json', 'Authorization' => "bearer #{Infield.api_key}" })
           end
         end
-
-        def deliver
-          while (task = tasks.shift)
-            upload_message(task)
-          end
-        end
       end
     end
 
     class << self
       def log(*messages, callstack: nil, validated: false)
         messages = messages.select(&method(:valid_message)) unless validated
-        messages.each { |message| tasks << Task.new(message, callstack) }
-        Runner.event.set
+        messages.each { |message| Runner.enqueue(Task.new(message, callstack)) }
+        true
       end
 
       private
 
-      delegate :tasks, to: 'Infield::DeprecationWarning::Runner'
-
       def valid_message(message)
         message =~ /(?:^|\W)deprecated(?:$|\W)/i
       end

data/lib/infield/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Infield
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 end

data/lib/infield.rb

@@ -13,7 +13,7 @@ module Infield
   class << self
     attr_accessor :api_key, :repo_environment_id, :environment, :infield_api_url
 
-    def run(api_key: nil, repo_environment_id: nil, environment: nil)
+    def run(api_key: nil, repo_environment_id: nil, environment: nil, sleep_interval: 5, batch_size: 10, queue_limit: 30)
       @api_key = api_key || ENV['INFIELD_API_KEY']
       @repo_environment_id = repo_environment_id
       @infield_api_url = ENV['INFIELD_API_URL'] || 'https://app.infield.ai'
@@ -21,7 +21,7 @@ module Infield
       raise 'repo_environment_id is required' unless @repo_environment_id
 
       @environment = environment || defined?(Rails) ? Rails.env : nil
-      DeprecationWarning::Runner.run
+      DeprecationWarning::Runner.run(sleep_interval: sleep_interval, batch_size: batch_size, queue_limit: queue_limit)
     end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: infield
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Infield
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+date: 2024-09-16 00:00:00.000000000 Z
+dependencies: []
 description:
 email:
 - support@infield.ai