getaround_utils 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f23d197d155aa4f24f2e2d745dda9d8b1c945de036cdf619155abbf226adbeb1
-  data.tar.gz: 2517396bd5ed9a98e375d8edc390c3c1dcd79c5a33f347344d0f6125be11af57
+  metadata.gz: ac89bb57e946209df2cd90a27662dd6eafe09eaf1ad75c70e0120843600eaa73
+  data.tar.gz: b5e42696a498a174113437cf8350b1eb742391f74588621a3bae00e12cab7fc4
 SHA512:
-  metadata.gz: 43beef4a44ae0a1e99fe96d95ce0a3dff0597e5e71ae522adbb67f4204a01d65ff76dac4b7e07575eca10165fa0f059dca42b0061bb7193f39692a10a9a187d6
-  data.tar.gz: a05094694bd7d64b80f79425366b3ac6440107e1750a421fdf4449f4e68d34efce4646ba6704a4effb4e928ce4d55441944b8833fc49693cb9a17bfeeeb52bc7
+  metadata.gz: 20debe44bc0c094ce9dcc3cde822eb7565c6c399cc4ba5849c2a6c5bbc249c9fa96e8fda50648c9974c03b1177030b3880aab5df65c3eba6ea9632845e796d69
+  data.tar.gz: 3017542f9d2b157a8f6ee9637c5659212a3fa3ad8803975ac2fd8b76e255487183e7b671944a6ec8a9b841890917dfb0c3ae7f3973eba0966257d7a9089c0161

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    getaround_utils (0.1.19)
+    getaround_utils (0.1.20)
 
 GEM
   remote: https://rubygems.org/

data/lib/getaround_utils/utils.rb

@@ -2,4 +2,5 @@ module GetaroundUtils::Utils
   autoload :AsyncQueue, 'getaround_utils/utils/async_queue'
   autoload :DeepKeyValue, 'getaround_utils/utils/deep_key_value'
   autoload :HttpReporter, 'getaround_utils/utils/http_reporter'
+  autoload :CapturReporter, 'getaround_utils/utils/captur_reporter'
 end

data/lib/getaround_utils/utils/async_queue.rb

@@ -2,58 +2,48 @@ module GetaroundUtils; end
 module GetaroundUtils::Utils; end
 
 class GetaroundUtils::Utils::AsyncQueue
-  class << self
-    include GetaroundUtils::Mixins::Loggable
+  include GetaroundUtils::Mixins::Loggable
 
-    MAX_QUEUE_SIZE = 100
-    MUTEX = Mutex.new
+  MAX_QUEUE_SIZE = 1000
+  BUFFER_SIZE = 50
 
-    def perform
-      raise NotImplementedError
-    end
+  def initialize
+    @queue = []
+    @mutex = Mutex.new
+    @closed = false
+    @worker = Thread.new(&method(:thread_run))
+    at_exit { terminate }
+  end
 
-    def perform_async(*args)
-      start_once!
+  def perform
+    raise NotImplementedError
+  end
 
-      if @queue.size > MAX_QUEUE_SIZE
-        loggable('warn', 'Queue is overflowing')
-        return
+  def push(payload)
+    @mutex.synchronize do
+      if @queue.size >= MAX_QUEUE_SIZE
+        loggable_log(:error, 'queue overflow')
+      else
+        @queue.push(payload)
       end
-
-      @queue.push(args)
     end
+  end
 
-    def start_once!
-      MUTEX.synchronize do
-        return unless @parent.nil?
-
-        @parent = Process.pid
-        @queue = Queue.new
-
-        @worker = Thread.new do
-          while args = @queue.pop
-            begin
-              perform(*args)
-            rescue ClosedQueueError
-              nil
-            rescue StandardError => e
-              loggable('error', e.message, class: e.class.to_s, backtrace: e.backtrace)
-            end
-          end
-        end
-
-        at_exit { terminate }
-      end
-    end
+  def thread_run
+    loop do
+      buffer = @mutex.synchronize { @queue.shift(BUFFER_SIZE) }
+      loggable_log(:debug, 'thread_run', buffer_size: buffer.size)
+      return if @closed && buffer.empty?
 
-    def terminate
-      @queue&.close
-      @worker&.join
+      perform(buffer) unless buffer.empty?
+      sleep(1) unless @mutex.synchronize { @queue.any? }
+    rescue StandardError => e
+      loggable_log(:error, e.message, class: e.class.to_s, backtrace: e.backtrace)
     end
+  end
 
-    def reset
-      terminate
-      @parent = nil
-    end
+  def terminate
+    @mutex.synchronize { @closed = true }
+    @worker&.join
   end
 end

data/lib/getaround_utils/utils/captur_reporter.rb

@@ -0,0 +1,32 @@
+require 'json'
+require 'faraday'
+require 'getaround_utils/utils/async_queue'
+
+class GetaroundUtils::Utils::CapturReporter < GetaroundUtils::Utils::AsyncQueue
+  CAPTUR_URL = ENV['CAPTUR_URL']
+
+  def perform(events)
+    return unless CAPTUR_URL&.match('^https?://')
+
+    Faraday.post(CAPTUR_URL) do |req|
+      req.options[:open_timeout] = 1
+      req.options[:timeout] = 1
+      req.headers = { 'Content-Type': 'application/json' }
+      req.body = JSON.generate(events: events, metas: metas)
+    end
+  end
+
+  def metas
+    {}
+  end
+
+  def push(uuid:, type:, anonymous_id:, timestamp: nil, attributes: {})
+    super(
+      uuid: uuid,
+      type: type,
+      timestamp: timestamp || Time.now.iso8601,
+      anonymous_id: anonymous_id,
+      attributes: attributes,
+    )
+  end
+end

data/lib/getaround_utils/utils/deep_key_value.rb

@@ -2,47 +2,48 @@ module GetaroundUtils; end
 module GetaroundUtils::Utils; end
 
 module GetaroundUtils::Utils::DeepKeyValue
+  def self.escape(value, max_length = 512)
+    value = value[1...-1] if value =~ /^".*"$/
+    value = "#{value[0...max_length]} ..." if value.length >= max_length
+    value.inspect
+  end
+
   def self.serialize(data)
     case data
     when Array
-      flattify(data).map { |key, value| "#{key}=#{value}" }.join(' ')
+      flattify(data).map { |key, value| "#{key}=#{serialize(value)}" }.join(' ')
     when Hash
-      flattify(data).map { |key, value| "#{key}=#{value}" }.join(' ')
+      flattify(data).map { |key, value| "#{key}=#{serialize(value)}" }.join(' ')
     when Numeric
       data.to_s
     when String
-      data =~ /^".*"$/ ? data : data.inspect
+      escape(data)
     else
-      data.to_s.inspect
+      escape(data.to_s)
     end
   end
 
   # https://stackoverflow.com/questions/48836464/how-to-flatten-a-hash-making-each-key-a-unique-value
-  def self.flattify(value, result = {}, path = [], max_length = 512, max_depth = 5)
+  def self.flattify(value, result = {}, path = [], max_depth = 5)
     if path.length > max_depth
-      result[path.join(".")] = '"..."'
+      result[path.join(".")] = '...'
       return result
     end
     case value
     when Array
       value.each.with_index(0) do |v, i|
-        flattify(v, result, path + [i], max_length, max_depth)
+        flattify(v, result, path + [i], max_depth)
       end
     when Hash
       value.each do |k, v|
-        flattify(v, result, path + [k], max_length, max_depth)
+        flattify(v, result, path + [k], max_depth)
       end
     when Numeric
-      result[path.join(".")] = value.to_s
+      result[path.join(".")] = value
     when String
-      value = if value =~ /^".*"$/
-        value.length >= max_length ? %{#{value[0...max_length]} ..."} : value
-      else
-        value.length >= max_length ? %{#{value[0...max_length]} ...}.inspect : value.inspect
-      end
       result[path.join(".")] = value
     else
-      flattify(value.to_s, result, path, max_length, max_depth)
+      flattify(value.to_s, result, path, max_depth)
     end
     result
   end

data/lib/getaround_utils/utils/http_reporter.rb

@@ -1,29 +1,11 @@
-require 'json'
-require 'faraday'
-require 'getaround_utils/utils/async_queue'
-
 class GetaroundUtils::Utils::HttpReporter
-  class AsyncQueue < GetaroundUtils::Utils::AsyncQueue
-    def self.perform(url:, params: {}, headers: {}, body: nil)
-      Faraday.post(url) do |req|
-        req.options[:open_timeout] = 1
-        req.options[:timeout] = 1
-        req.params = params
-        req.headers = headers
-        req.body = body
-      end
-    end
-  end
+  include GetaroundUtils::Mixins::Loggable
 
-  def initialize(url:)
-    @url = url
+  def initialize(_)
+    loggable_log(:warn, 'use of deprecated class')
   end
 
-  def report(event)
-    AsyncQueue.perform_async(
-      url: @url,
-      headers: { 'Content-Type' => 'application/json' },
-      body: JSON.generate(event)
-    )
+  def report(_)
+    loggable_log(:warn, 'use of deprecated class')
   end
 end

data/lib/getaround_utils/version.rb

@@ -1,3 +1,3 @@
 module GetaroundUtils
-  VERSION = '0.1.19'.freeze
+  VERSION = '0.1.20'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getaround_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Drivy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -213,6 +213,7 @@ files:
 - lib/getaround_utils/railties/lograge.rb
 - lib/getaround_utils/utils.rb
 - lib/getaround_utils/utils/async_queue.rb
+- lib/getaround_utils/utils/captur_reporter.rb
 - lib/getaround_utils/utils/deep_key_value.rb
 - lib/getaround_utils/utils/http_reporter.rb
 - lib/getaround_utils/version.rb