traxor 0.1.20 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dea761fab3589a04486586d79af18c4b8842bd244604e8d615991e5448440c3f
-  data.tar.gz: 776766f8e25224a68067ab89474fd6e65be172ad116f1f6dae5138b5de7363d6
+  metadata.gz: a473abfe8f2c81c9eb1e13e44c41059ede049b24070c5cf3beac9f3c0b68bbcb
+  data.tar.gz: 00e1a58008e868bb376b57206f184b02d0189e13600fd251e0c9dbcc2f3c9cea
 SHA512:
-  metadata.gz: 7312eacdd60f37e8c1b901ba96f172e7846695af03168f35811d0615c2eacf6cb162465065b8f43e4f6d0d3c7cb696ba4de094ce515af21fa280ecc16ef8ee4f
-  data.tar.gz: 98d4259851f7126615e7dacdb6c2273234a9171d5260745edaddbac06a46fb42b1696e17cf820e8836d5ca3d3aabfdfa6fe4dbc2e0f954ab37f9890bfa128a8a
+  metadata.gz: 6d1a62f7e1c1f9d3f47689ce54ff65a124f8e8bf77dfe0d59423e152f686ae400ddb6d900a3eb56bae628778c4620bbc1a685d698b93c6ee4366fedb1cb9b97c
+  data.tar.gz: bdefe79058a721b7d9eb7bc1347074c44b3abe99a4b35f0ba5432ad6ac892d2d0b4e78e111d59a288d34acc2eb9c4ceb9845e57463dc87e5d9aaa8e74f9f2d4a

data/.rubocop.yml

@@ -11,6 +11,18 @@ Style/Documentation:
 Metrics/LineLength:
   Max: 100
 
+Metrics/AbcSize:
+  Max: 30
+
+Metrics/MethodLength:
+  Max: 15
+
+Metrics/PerceivedComplexity:
+  Max: 15
+
+Metrics/CyclomaticComplexity:
+  Max: 15
+
 Metrics/BlockLength:
   Exclude:
     - '**/spec/**/*'

data/Gemfile.lock

@@ -1,49 +1,49 @@
 PATH
   remote: .
   specs:
-    traxor (0.1.20)
+    traxor (0.2.0)
       activesupport (>= 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.1)
-      actionpack (= 5.2.1)
+    actioncable (5.2.2)
+      actionpack (= 5.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.1)
-      actionview (= 5.2.1)
-      activesupport (= 5.2.1)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1)
-      activesupport (= 5.2.1)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.1)
-      activesupport (= 5.2.1)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
       arel (>= 9.0)
-    activestorage (5.2.1)
-      actionpack (= 5.2.1)
-      activerecord (= 5.2.1)
+    activestorage (5.2.2)
+      actionpack (= 5.2.2)
+      activerecord (= 5.2.2)
       marcel (~> 0.3.1)
-    activesupport (5.2.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -65,7 +65,7 @@ GEM
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     connection_pool (2.2.2)
     crass (1.0.4)
     descendants_tracker (0.0.4)
@@ -73,14 +73,14 @@ GEM
     diff-lcs (1.3)
     docile (1.3.1)
     equalizer (0.0.11)
-    erubi (1.7.1)
-    faraday (0.15.2)
+    erubi (1.8.0)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.25)
+    ffi (1.10.0)
     formatador (0.2.5)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    guard (2.14.2)
+    guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -94,86 +94,88 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.1.0)
+    i18n (1.5.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    jaro_winkler (1.5.1)
+    jaro_winkler (1.5.2)
     json (2.1.0)
     kwalify (0.7.2)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.2.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.13)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
+    marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.0)
-    mimemagic (0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
     mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     multipart-post (2.0.0)
     nenv (0.3.0)
     nio4r (2.3.1)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.0)
+      mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.12.1)
-    parser (2.5.1.2)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    rack (2.0.5)
-    rack-protection (2.0.3)
+    psych (3.1.0)
+    rack (2.0.6)
+    rack-protection (2.0.5)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.1)
-      actioncable (= 5.2.1)
-      actionmailer (= 5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
-      activemodel (= 5.2.1)
-      activerecord (= 5.2.1)
-      activestorage (= 5.2.1)
-      activesupport (= 5.2.1)
+    rails (5.2.2)
+      actioncable (= 5.2.2)
+      actionmailer (= 5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
+      activemodel (= 5.2.2)
+      activerecord (= 5.2.2)
+      activestorage (= 5.2.2)
+      activesupport (= 5.2.2)
       bundler (>= 1.3.0)
-      railties (= 5.2.1)
+      railties (= 5.2.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.1)
-      actionpack (= 5.2.1)
-      activesupport (= 5.2.1)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (12.3.1)
+    rake (12.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    redis (4.0.2)
-    reek (5.0.2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    redis (4.1.0)
+    reek (5.3.0)
       codeclimate-engine-rb (~> 0.4.0)
       kwalify (~> 0.7.0)
       parser (>= 2.5.0.0, < 2.6, != 2.5.1.1)
+      psych (~> 3.1.0)
       rainbow (>= 2.0, < 4.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -181,7 +183,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
@@ -190,19 +192,20 @@ GEM
     rspec-support (3.8.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.58.2)
+    rubocop (0.62.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     shellany (0.0.1)
-    sidekiq (5.2.1)
+    sidekiq (5.2.5)
       connection_pool (~> 2.2, >= 2.2.2)
+      rack (>= 1.5.0)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
     simplecov (0.16.1)
@@ -217,11 +220,11 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.4.1)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -249,6 +252,3 @@ DEPENDENCIES
   sidekiq
   simplecov
   traxor!
-
-BUNDLED WITH
-   1.16.4

data/lib/traxor.rb

@@ -19,7 +19,7 @@ module Traxor
   end
 
   def self.enabled?
-    @enabled ||= ENV.fetch('TRAXOR_ENABLED', true).present?
+    ENV['DISABLE_TRAXOR'].blank?
   end
 
   def self.scopes
@@ -28,6 +28,8 @@ module Traxor
                 .to_s
                 .downcase
                 .split(',')
+                .map(&:strip)
+                .map(&:chomp)
                 .map(&:to_sym)
   end
 end

data/lib/traxor/faraday.rb

@@ -12,8 +12,10 @@ module Traxor
       duration = (event.duration || 0.0).to_f
       tags = { faraday_host: url.host, faraday_method: event.payload[:method] }
 
-      Metric.count COUNT_METRIC, 1, tags
-      Metric.measure DURATION_METRIC, "#{duration.round(2)}ms", tags if duration.positive?
+      Metric::Line.record do |l|
+        l.count COUNT_METRIC, 1, tags
+        l.measure DURATION_METRIC, "#{duration.round(2)}ms", tags if duration.positive?
+      end
     end
   end
 end

data/lib/traxor/metric.rb

@@ -1,39 +1,19 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
+require 'traxor/metric/line'
 
 module Traxor
   module Metric
     def self.count(name, value, tags = {})
-      log("count##{name}=#{value} #{tag_string(tags)}")
+      Line.record { |l| l.count(name, value, tags) }
     end
 
     def self.measure(name, value, tags = {})
-      log("measure##{name}=#{value} #{tag_string(tags)}")
+      Line.record { |l| l.measure(name, value, tags) }
     end
 
     def self.sample(name, value, tags = {})
-      log("sample##{name}=#{value} #{tag_string(tags)}")
-    end
-
-    def self.tag_string(tags)
-      Hash(tags).merge(Traxor::Tags.all).map do |tag_name, tag_value|
-        "tag##{tag_name}=#{tag_value}"
-      end.join(' ')
-    end
-
-    def self.normalize_values(value)
-      value.to_s.gsub(/::/, '.').underscore.strip
-    end
-
-    def self.log(string)
-      return unless Traxor.enabled?
-
-      logger.info(normalize_values(string))
-    end
-
-    def self.logger
-      Traxor.logger
+      Line.record { |l| l.sample(name, value, tags) }
     end
   end
 end

data/lib/traxor/metric/line.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+
+module Traxor
+  module Metric
+    class Line
+      def self.record
+        line = new
+        yield line
+        line.flush
+      end
+
+      def initialize
+        @counts = []
+        @measures = []
+        @samples = []
+        @tags = {}
+      end
+
+      def count(name, value, tags = {})
+        @counts << [name, value]
+        @tags.merge!(tags)
+      end
+
+      def measure(name, value, tags = {})
+        @measures << [name, value]
+        @tags.merge!(tags)
+      end
+
+      def sample(name, value, tags = {})
+        @samples << [name, value]
+        @tags.merge!(tags)
+      end
+
+      def flush
+        line = ''
+
+        @counts.each { |name, value| line += " count##{name}=#{value}" }
+        @measures.each { |name, value| line += " measure##{name}=#{value}" }
+        @samples.each { |name, value| line += " sample##{name}=#{value}" }
+
+        log("#{line} #{tag_string(@tags)}")
+      end
+
+      def tag_string(tags)
+        Hash(tags).merge(Traxor::Tags.all).map do |tag_name, tag_value|
+          "tag##{tag_name}=#{tag_value}"
+        end.join(' ')
+      end
+
+      def normalize_values(value)
+        value.to_s.gsub(/::/, '.').underscore.strip
+      end
+
+      def log(string)
+        return unless Traxor.enabled?
+
+        logger.info(normalize_values(string))
+      end
+
+      def logger
+        Traxor.logger
+      end
+    end
+  end
+end

data/lib/traxor/rack/middleware/pre.rb

@@ -30,34 +30,38 @@ module Traxor
           Middleware.gc_stat_after = GC.stat
           Middleware.post_finish_at = Time.now.utc
 
-          record_request_metrics
-          record_gc_metrics
+          record_metrics
 
           [status, headers, body]
         end
 
-        def record_request_metrics
+        def record_metrics
+          Metric::Line.record do |l|
+            record_request_metrics(l)
+            record_gc_metrics(l)
+          end
+        end
+
+        def record_request_metrics(line)
           if Middleware.middleware_total.positive?
-            Metric.measure MIDDLEWARE_METRIC, "#{Middleware.middleware_total.round(2)}ms"
+            line.measure MIDDLEWARE_METRIC, "#{Middleware.middleware_total.round(2)}ms"
           end
           if Middleware.request_total.positive?
-            Metric.measure DURATION_METRIC, "#{Middleware.request_total.round(2)}ms"
+            line.measure DURATION_METRIC, "#{Middleware.request_total.round(2)}ms"
           end
           if Middleware.request_queue_total.positive?
-            Metric.measure QUEUE_METRIC, "#{Middleware.request_queue_total.round(2)}ms"
+            line.measure QUEUE_METRIC, "#{Middleware.request_queue_total.round(2)}ms"
           end
-          Metric.count REQUEST_COUNT_METRIC, 1
+          line.count REQUEST_COUNT_METRIC, 1
         end
 
-        def record_gc_metrics
+        def record_gc_metrics(line)
           total_gc_time = (GC::Profiler.total_time * 1_000).to_f
-          if total_gc_time.positive?
-            Metric.measure GC_DURATION_METRIC, "#{total_gc_time.round(2)}ms"
-          end
-          Metric.count GC_COUNT_METRIC, Middleware.gc_count
-          Metric.count MAJOR_METRIC, Middleware.gc_major_count
-          Metric.count MINOR_METRIC, Middleware.gc_minor_count
-          Metric.count ALLOCATED_METRIC, Middleware.gc_allocated_objects_count
+          line.measure GC_DURATION_METRIC, "#{total_gc_time.round(2)}ms" if total_gc_time.positive?
+          line.count GC_COUNT_METRIC, Middleware.gc_count
+          line.count MAJOR_METRIC, Middleware.gc_major_count
+          line.count MINOR_METRIC, Middleware.gc_minor_count
+          line.count ALLOCATED_METRIC, Middleware.gc_allocated_objects_count
 
           GC::Profiler.clear
         end

data/lib/traxor/rails/action_controller.rb

@@ -12,7 +12,7 @@ module Traxor
       VIEW_METRIC = 'rails.action_controller.view.duration'
       EXCEPTION_METRIC = 'rails.action_controller.exception.count'
 
-      def self.set_controller_tags(event)
+      def self.add_controller_tags(event)
         Traxor::Tags.controller = {
           controller_name: event.payload[:controller],
           controller_action: event.payload[:action],
@@ -27,12 +27,14 @@ module Traxor
         view_runtime = (event.payload[:view_runtime] || 0.0).to_f
         ruby_runtime = duration - db_runtime - view_runtime
 
-        Metric.count COUNT_METRIC, 1
-        Metric.measure TOTAL_METRIC, "#{duration.round(2)}ms" if duration.positive?
-        Metric.measure RUBY_METRIC, "#{ruby_runtime.round(2)}ms" if ruby_runtime.positive?
-        Metric.measure DB_METRIC, "#{db_runtime.round(2)}ms" if db_runtime.positive?
-        Metric.measure VIEW_METRIC, "#{view_runtime.round(2)}ms" if view_runtime.positive?
-        Metric.count EXCEPTION_METRIC, 1 if exception
+        Metric::Line.record do |l|
+          l.count COUNT_METRIC, 1
+          l.measure TOTAL_METRIC, "#{duration.round(2)}ms" if duration.positive?
+          l.measure RUBY_METRIC, "#{ruby_runtime.round(2)}ms" if ruby_runtime.positive?
+          l.measure DB_METRIC, "#{db_runtime.round(2)}ms" if db_runtime.positive?
+          l.measure VIEW_METRIC, "#{view_runtime.round(2)}ms" if view_runtime.positive?
+          l.count EXCEPTION_METRIC, 1 if exception
+        end
       end
     end
   end
@@ -41,7 +43,7 @@ end
 if Traxor.enabled? && Traxor.scopes.include?(:action_controller)
   ActiveSupport::Notifications.subscribe 'start_processing.action_controller' do |*args|
     event = ActiveSupport::Notifications::Event.new(*args)
-    Traxor::Rails::ActionController.set_controller_tags(event)
+    Traxor::Rails::ActionController.add_controller_tags(event)
   end
 
   ActiveSupport::Notifications.subscribe 'process_action.action_controller' do |*args|

data/lib/traxor/rails/active_record.rb

@@ -16,14 +16,17 @@ module Traxor
         sql = event.payload[:sql].to_s.strip.upcase
         name = event.payload[:name].to_s.strip
         return if name.casecmp('SCHEMA').zero?
+
         tags = {}
         tags[:active_record_class_name] = name.split.first if name.length.positive?
 
-        Metric.count COUNT_METRIC, 1, tags
-        Metric.count SELECT_METRIC, 1, tags if sql.start_with?('SELECT')
-        Metric.count INSERT_METRIC, 1, tags if sql.start_with?('INSERT')
-        Metric.count UPDATE_METRIC, 1, tags if sql.start_with?('UPDATE')
-        Metric.count DELETE_METRIC, 1, tags if sql.start_with?('DELETE')
+        Metric::Line.record do |l|
+          l.count COUNT_METRIC, 1, tags
+          l.count SELECT_METRIC, 1, tags if sql.start_with?('SELECT')
+          l.count INSERT_METRIC, 1, tags if sql.start_with?('INSERT')
+          l.count UPDATE_METRIC, 1, tags if sql.start_with?('UPDATE')
+          l.count DELETE_METRIC, 1, tags if sql.start_with?('DELETE')
+        end
       end
 
       def self.record_instantiations(event)

data/lib/traxor/sidekiq/middleware.rb

@@ -10,9 +10,11 @@ module Traxor
 
       def call(worker, _job, queue)
         tags = Traxor::Tags.sidekiq = { sidekiq_worker: worker.class.name, sidekiq_queue: queue }
-        Metric.count COUNT_METRIC, 1, tags
-        time = Benchmark.ms { yield }
-        Metric.measure DURATION_METRIC, "#{time.round(2)}ms", tags if time.positive?
+        Metric::Line.record do |l|
+          l.count COUNT_METRIC, 1, tags
+          time = Benchmark.ms { yield }
+          l.measure DURATION_METRIC, "#{time.round(2)}ms", tags if time.positive?
+        end
       end
     end
   end

data/lib/traxor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Traxor
-  VERSION = '0.1.20'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traxor
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Hansen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2019-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -245,6 +245,7 @@ files:
 - lib/traxor.rb
 - lib/traxor/faraday.rb
 - lib/traxor/metric.rb
+- lib/traxor/metric/line.rb
 - lib/traxor/rack.rb
 - lib/traxor/rack/middleware.rb
 - lib/traxor/rack/middleware/post.rb
@@ -279,8 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Log metrics to akkeris platform