traxor 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dea12e48a7280a76156a4caa29b2c0588a5e81ff0e136b385bba2254a964411
-  data.tar.gz: 62bf229220daa96172fc80e4899d6f042e57d1876cebb656964db3e2decad7bf
+  metadata.gz: f7e644afc68fb318da43bec6e34a9a4f6662fcf7cacf116a94d39e10ba172452
+  data.tar.gz: 16db21962c34d7d84db4b7aff652be9272e095cb3e205d31fdea8f8a0d7b793d
 SHA512:
-  metadata.gz: 78d0d2b367d8ee4863b4561015a0944ffcb19e8f1ff400e20270c9e045eb6b49b33d708fd6bfcfbeb0370477c8a68440bcf4053b0af92a2534c7ca3e0e008a14
-  data.tar.gz: 74aebfdd96c5d6012d8168f223b925a7a1e6e751f41c8866b9954bea4ccf0393f478701421773304df413ac29f2c0e635ed39f843ec942bd72076664ce992100
+  metadata.gz: b54e4ccbe47465d45e4e4d31cff7485cdfca76f520bc5e8922f19fd936ffc4b874d006746cd45c6d0d4100a0e467f91a80a6e7fb6578a6affe2bf13887cb15f8
+  data.tar.gz: d22e7c0713f62730e30ad4afbe575a72a9dca698370a458673744395875fec3dd0c9471b27f24110b940a7d36daca96e8a820bd357dd36553de617c366023438

data/.circleci/config.yml

@@ -26,6 +26,18 @@ jobs:
             - ./vendor/bundle
           key: v1-dependencies-{{ checksum "Gemfile.lock" }}
 
+      - run:
+          name: Bundler-Audit
+          command: bin/lois bundler-audit -g $GITHUB_CREDENTIALS
+
+      - run:
+          name: Rubocop
+          command: bin/lois rubocop -g $GITHUB_CREDENTIALS
+
+      - run:
+          name: Reek
+          command: bin/lois reek -g $GITHUB_CREDENTIALS
+
       - run:
           name: Setup Code Climate test-reporter
           command: |
@@ -44,5 +56,7 @@ jobs:
           path: results
       - store_artifacts:
           path: results
+      - store_artifacts:
+          path: lois
       - store_artifacts:
           path: coverage

data/.reek

@@ -0,0 +1,9 @@
+---
+exclude_paths:
+  - vendor/bundle
+
+DuplicateMethodCall:
+  enabled: false
+
+IrresponsibleModule:
+  enabled: false

data/.rubocop.yml

@@ -0,0 +1,13 @@
+require: rubocop-rspec
+
+AllCops:
+  DisplayCopNames: true
+
+Rails:
+  Enabled: true
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 100

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    traxor (0.1.13)
+    traxor (0.1.14)
       activesupport
 
 GEM
@@ -54,7 +54,11 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    brakeman (4.2.1)
     builder (3.2.3)
+    bundler-audit (0.6.0)
+      bundler (~> 1.2)
+      thor (~> 0.18)
     byebug (10.0.2)
     codeclimate-engine-rb (0.4.1)
       virtus (~> 1.0)
@@ -74,10 +78,21 @@ GEM
       multipart-post (>= 1.2, < 3)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    httparty (0.16.2)
+      multi_xml (>= 0.5.2)
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.1.0)
+    lois (0.1.6)
+      activesupport
+      brakeman
+      bundler-audit
+      httparty
+      reek
+      rubocop
+      simplecov
+      thor
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -90,6 +105,7 @@ GEM
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
     nio4r (2.3.0)
     nokogiri (1.8.2)
@@ -104,7 +120,7 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    rack (2.0.4)
+    rack (2.0.5)
     rack-protection (2.0.1)
       rack
     rack-test (1.0.0)
@@ -162,6 +178,8 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-rspec (1.25.1)
+      rubocop (>= 0.53.0)
     ruby-progressbar (1.9.0)
     sidekiq (5.1.3)
       concurrent-ruby (~> 1.0)
@@ -184,7 +202,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.1)
+    unicode-display_width (1.3.2)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -200,6 +218,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   faraday
+  lois
   pry
   pry-byebug
   rails
@@ -208,6 +227,7 @@ DEPENDENCIES
   rspec
   rspec_junit_formatter
   rubocop
+  rubocop-rspec
   sidekiq
   simplecov
   traxor!

data/bin/lois

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'lois' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path('bundle', __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('lois', 'lois')

data/lib/traxor/faraday.rb

@@ -1,13 +1,11 @@
 module Traxor
-  ActiveSupport::Notifications.subscribe('request.faraday') do |*args|
+  ActiveSupport::Notifications.subscribe('request.faraday'.freeze) do |*args|
     event = ActiveSupport::Notifications::Event.new(*args)
     url = event.payload[:url]
     duration = event.duration || 0.0
-    tags = { host: normalize_name(url.host), method: normalize_name(event.payload[:method]) }
+    tags = { faraday_host: url.host, faraday_method: event.payload[:method] }
 
-    Metric.count 'faraday.request.count', 1, tags
-    Metric.count "faraday.request.count.#{tags[:host]}", 1, tags
-    Metric.measure 'farday.request.duration', "#{duration.to_f.round(2)}ms", tags
-    Metric.measure "farday.request.duration.#{tags[:host]}", "#{duration.to_f.round(2)}ms", tags
+    Metric.count 'faraday.request.count'.freeze, 1, tags
+    Metric.measure 'faraday.request.duration'.freeze, "#{duration.to_f.round(2)}ms", tags
   end
 end

data/lib/traxor/metric.rb

@@ -1,25 +1,31 @@
+require 'active_support/inflector/inflections'
+
 module Traxor
   module Metric
     def self.count(name, value, tags = {})
-      logger.info("count##{name}=#{value} #{tag_string(tags)}".strip)
+      log("count##{name}=#{value} #{tag_string(tags)}")
     end
 
     def self.measure(name, value, tags = {})
-      logger.info("measure##{name}=#{value} #{tag_string(tags)}".strip)
+      log("measure##{name}=#{value} #{tag_string(tags)}")
     end
 
     def self.sample(name, value, tags = {})
-      logger.info("sample##{name}=#{value} #{tag_string(tags)}".strip)
+      log("sample##{name}=#{value} #{tag_string(tags)}")
     end
 
     def self.tag_string(tags)
-      tags.map do |tag_name, tag_value|
+      Traxor::Tags.all.merge(tags).map do |tag_name, tag_value|
         "tag##{tag_name}=#{tag_value}"
-      end.join(' ')
+      end.join(' '.freeze)
+    end
+
+    def self.normalize_values(value)
+      value.to_s.gsub(/::/, '.'.freeze).underscore.strip
     end
 
-    def self.logger
-      @logger ||= Traxor.config.logger
+    def self.log(string)
+      Traxor.logger.info(normalize_values(string))
     end
   end
 end

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

@@ -7,9 +7,9 @@ module Traxor
         end
 
         def call(env)
-          env['traxor.rack.middleware.pre_middleware_end'] = Time.now.to_f
+          Middleware.pre_finish_at = Time.now.utc
           status, headers, response = @app.call(env)
-          env['traxor.rack.middleware.post_middleware_start'] = Time.now.to_f
+          Middleware.post_start_at = Time.now.utc
 
           [status, headers, response]
         end

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

@@ -1,79 +1,30 @@
+require 'traxor/rack/middleware/queue_time'
+
 module Traxor
   module Rack
     module Middleware
       class Pre
-        # any timestamps before this are thrown out and the parser
-        # will try again with a larger unit (2000/1/1 UTC)
-        EARLIEST_ACCEPTABLE_TIME = Time.at(946684800)
-
-        DIVISORS = [1_000_000, 1_000, 1]
-
         def initialize(app)
           @app = app
         end
 
         def call(env)
-          env['traxor.rack.middleware.pre_middleware_start'] = Time.now.to_f
-          queue_duration = nil
-          request_start = env['HTTP_X_REQUEST_START']
-          if request_start
-            parsed = parse_request_queue(request_start)
-            queue_duration = (env['traxor.rack.middleware.pre_middleware_start'].to_f - parsed.to_f) * 1_000
-          end
-          status, headers, body = @app.call(env)
-          env['traxor.rack.middleware.post_middleware_end'] = Time.now.to_f
-
-          controller = env['action_controller.instance']
-          times = [
-            'traxor.rack.middleware.pre_middleware_start',
-            'traxor.rack.middleware.pre_middleware_end',
-            'traxor.rack.middleware.post_middleware_start',
-            'traxor.rack.middleware.post_middleware_end'
-          ]
-
-          tags = {}
+          Middleware.request_start_at = QueueTime.parse(env)
 
-          if times.all? { |t| env[t].present? }
-            pre_time = (env['traxor.rack.middleware.pre_middleware_end'].to_f - env['traxor.rack.middleware.pre_middleware_start'].to_f)
-            post_time = (env['traxor.rack.middleware.post_middleware_end'].to_f - env['traxor.rack.middleware.post_middleware_start'].to_f)
-            middleware_time = (pre_time + post_time) * 1_000
-            total_time = (env['traxor.rack.middleware.post_middleware_end'].to_f - env['traxor.rack.middleware.pre_middleware_start'].to_f) * 1_000
-
-            if controller
-              method = env['REQUEST_METHOD'].to_s
-              tags = { controller: Traxor.normalize_name(controller.class), action: Traxor.normalize_name(controller.action_name), method: Traxor.normalize_name(method) }
-              controller_path = tags.values.join('.')
-
-              Metric.measure 'rack.request.middleware.duration', "#{middleware_time.round(2)}ms", tags
-              Metric.measure "rack.request.middleware.duration.#{controller_path}", "#{middleware_time.round(2)}ms", tags
-              Metric.measure "rack.request.queue.duration.#{controller_path}", "#{queue_duration.round(2)}ms", tags if queue_duration
-              Metric.measure "rack.request.duration.#{controller_path}", "#{total_time.round(2)}ms", tags
-              Metric.count "rack.request.count.#{controller_path}", 1, tags
-            end
-
-            Metric.measure 'rack.request.duration', "#{total_time.round(2)}ms", tags
-          end
+          Middleware.pre_start_at = Time.now.utc
+          status, headers, body = @app.call(env)
+          Middleware.post_finish_at = Time.now.utc
 
-          Metric.measure 'rack.request.queue.duration', "#{queue_duration.round(2)}ms", tags if queue_duration
-          Metric.count 'rack.request.count', 1, tags
+          record_metrics
 
           [status, headers, body]
         end
 
-        def parse_request_queue(string)
-          value = string.to_s.gsub(/t=/, '')
-          DIVISORS.each do |divisor|
-            begin
-              t = Time.at(value.to_f / divisor)
-              return t if t > EARLIEST_ACCEPTABLE_TIME
-            rescue RangeError
-              # On Ruby versions built with a 32-bit time_t, attempting to
-              # instantiate a Time object in the far future raises a RangeError,
-              # in which case we know we've chosen the wrong divisor.
-            end
-          end
-
-          nil
+        def record_metrics
+          Metric.measure 'rack.request.middleware.duration'.freeze, "#{Middleware.middleware_total.round(2)}ms" if Middleware.middleware_total.positive?
+          Metric.measure 'rack.request.duration'.freeze, "#{Middleware.request_total.round(2)}ms" if Middleware.request_total.positive?
+          Metric.measure 'rack.request.queue.duration'.freeze, "#{Middleware.request_queue_total.round(2)}ms" if Middleware.request_queue_total.positive?
+          Metric.count 'rack.request.count'.freeze, 1
         end
       end
     end

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

@@ -0,0 +1,33 @@
+module Traxor
+  module Rack
+    module Middleware
+      module QueueTime
+        X_REQUEST_START = 'HTTP_X_REQUEST_START'.freeze
+
+        # any timestamps before this are thrown out and the parser
+        # will try again with a larger unit (2000/1/1 UTC)
+        EARLIEST_ACCEPTABLE_TIME = Time.at(946_684_800).utc
+
+        DIVISORS = [1_000_000, 1_000, 1].freeze
+
+        def self.parse(env)
+          return unless env[X_REQUEST_START]
+
+          value = env[X_REQUEST_START].to_s.sub(/t=/, ''.freeze)
+          DIVISORS.each do |divisor|
+            begin
+              time = Time.at(value.to_f / divisor).utc
+              return time if time > EARLIEST_ACCEPTABLE_TIME
+            rescue RangeError
+              # On Ruby versions built with a 32-bit time_t, attempting to
+              # instantiate a Time object in the far future raises a RangeError,
+              # in which case we know we've chosen the wrong divisor.
+            end
+          end
+
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/traxor/rack/middleware.rb

@@ -0,0 +1,34 @@
+require 'traxor/rack/middleware/pre'
+require 'traxor/rack/middleware/post'
+
+module Traxor
+  module Rack
+    module Middleware
+      thread_mattr_accessor :pre_start_at,
+                            :pre_finish_at,
+                            :post_start_at,
+                            :post_finish_at,
+                            :request_start_at
+
+      def self.time_before
+        pre_finish_at.to_f - pre_start_at.to_f
+      end
+
+      def self.time_after
+        post_finish_at.to_f - post_start_at.to_f
+      end
+
+      def self.middleware_total
+        (time_before + time_after) * 1_000
+      end
+
+      def self.request_total
+        (post_finish_at.to_f - pre_start_at.to_f) * 1_000
+      end
+
+      def self.request_queue_total
+        (pre_start_at.to_f - request_start_at.to_f) * 1_000
+      end
+    end
+  end
+end

data/lib/traxor/rack.rb

@@ -0,0 +1 @@
+require 'traxor/rack/middleware'

data/lib/traxor/rails/action_controller.rb

@@ -1,36 +1,26 @@
 module Traxor
-  ActiveSupport::Notifications.subscribe 'process_action.action_controller' do |*args|
+  ActiveSupport::Notifications.subscribe 'start_processing.action_controller'.freeze do |*args|
+    event = ActiveSupport::Notifications::Event.new(*args)
+    Traxor::Tags.controller = {
+      controller_name: event.payload[:controller],
+      controller_action: event.payload[:action],
+      controller_method: event.payload[:method]
+    }
+  end
+
+  ActiveSupport::Notifications.subscribe 'process_action.action_controller'.freeze do |*args|
     event = ActiveSupport::Notifications::Event.new(*args)
-    request = ActionDispatch::Request.new(event.payload[:headers])
     exception = event.payload[:exception]
-    controller = normalize_name(event.payload[:controller])
-    action = normalize_name(event.payload[:action])
     duration = event.duration || 0.0
-    db_runtime = event.payload[:db_runtime] || 0
-    view_runtime = event.payload[:view_runtime] || 0
+    db_runtime = event.payload[:db_runtime] || 0.0
+    view_runtime = event.payload[:view_runtime] || 0.0
     ruby_runtime = duration.to_f - db_runtime.to_f - view_runtime.to_f
 
-    controller_path = normalize_name("#{controller.underscore}.#{action.underscore}.#{request.method.downcase}")
-    tags = { controller: controller, action: action, method: normalize_name(request.method) }
-
-    Metric.count 'rails.action_controller.count', 1, tags
-    Metric.count "rails.action_controller.count.#{controller_path}", 1, tags
-
-    Metric.measure 'rails.action_controller.total.duration', "#{duration.to_f.round(2)}ms", tags
-    Metric.measure "rails.action_controller.total.duration.#{controller_path}", "#{duration.to_f.round(2)}ms", tags
-
-    Metric.measure 'rails.action_controller.ruby.duration', "#{ruby_runtime.to_f.round(2)}ms", tags
-    Metric.measure "rails.action_controller.ruby.duration.#{controller_path}", "#{ruby_runtime.to_f.round(2)}ms", tags
-
-    Metric.measure 'rails.action_controller.db.duration', "#{db_runtime.to_f.round(2)}ms", tags
-    Metric.measure "rails.action_controller.db.duration.#{controller_path}", "#{db_runtime.to_f.round(2)}ms", tags
-
-    Metric.measure 'rails.action_controller.view.duration', "#{view_runtime.to_f.round(2)}ms", tags
-    Metric.measure "rails.action_controller.view.duration.#{controller_path}", "#{view_runtime.to_f.round(2)}ms", tags
-
-    if exception.present?
-      Metric.count 'rails.action_controller.exception.count', 1, tags
-      Metric.count "rails.action_controller.exception.count.#{controller_path}", 1, tags
-    end
+    Metric.count 'rails.action_controller.count'.freeze, 1
+    Metric.measure 'rails.action_controller.total.duration'.freeze, "#{duration.to_f.round(2)}ms"
+    Metric.measure 'rails.action_controller.ruby.duration'.freeze, "#{ruby_runtime.to_f.round(2)}ms"
+    Metric.measure 'rails.action_controller.db.duration'.freeze, "#{db_runtime.to_f.round(2)}ms"
+    Metric.measure 'rails.action_controller.view.duration'.freeze, "#{view_runtime.to_f.round(2)}ms"
+    Metric.count 'rails.action_controller.exception.count'.freeze, 1 if exception
   end
 end

data/lib/traxor/rails/action_mailer.rb

@@ -1,9 +1,8 @@
 module Traxor
-  ActiveSupport::Notifications.subscribe 'deliver.action_mailer' do |*args|
+  ActiveSupport::Notifications.subscribe 'deliver.action_mailer'.freeze do |*args|
     event = ActiveSupport::Notifications::Event.new(*args)
-    tags = { mailer: normalize_name(event.payload[:mailer]) }
+    tags = { action_mailer_class_name: event.payload[:mailer] }
 
-    Metric.count 'rails.action_mailer.sent.count', 1, tags
-    Metric.count "rails.action_mailer.sent.count.#{tags[:mailer]}", 1, tags
+    Metric.count 'rails.action_mailer.sent.count'.freeze, 1, tags
   end
 end

data/lib/traxor/rails/active_record.rb

@@ -1,26 +1,24 @@
 module Traxor
-  ActiveSupport::Notifications.subscribe 'sql.active_record' do |*args|
+  ActiveSupport::Notifications.subscribe 'sql.active_record'.freeze do |*args|
     event = ActiveSupport::Notifications::Event.new(*args)
     sql = event.payload[:sql].to_s.strip.upcase
     name = event.payload[:name].to_s.strip.upcase
-    next if ['SCHEMA'].any?(name)
+    next if ['SCHEMA'.freeze].any?(name)
     tags = {}
-    tags[:name] = normalize_name(name.split.first) if name.length.positive?
+    tags[:active_record_class_name] = name.split.first if name.length.positive?
 
-    Metric.count 'rails.active_record.statements.count', 1, tags
-    Metric.count 'rails.active_record.statements.select.count', 1, tags if sql.starts_with?('SELECT')
-    Metric.count 'rails.active_record.statements.insert.count', 1, tags if sql.starts_with?('INSERT')
-    Metric.count 'rails.active_record.statements.update.count', 1, tags if sql.starts_with?('UPDATE')
-    Metric.count 'rails.active_record.statements.delete.count', 1, tags if sql.starts_with?('DELETE')
+    Metric.count 'rails.active_record.statements.count'.freeze, 1, tags
+    Metric.count 'rails.active_record.statements.select.count'.freeze, 1, tags if sql.starts_with?('SELECT'.freeze)
+    Metric.count 'rails.active_record.statements.insert.count'.freeze, 1, tags if sql.starts_with?('INSERT'.freeze)
+    Metric.count 'rails.active_record.statements.update.count'.freeze, 1, tags if sql.starts_with?('UPDATE'.freeze)
+    Metric.count 'rails.active_record.statements.delete.count'.freeze, 1, tags if sql.starts_with?('DELETE'.freeze)
   end
 
-  ActiveSupport::Notifications.subscribe 'instantiation.active_record' do |*args|
+  ActiveSupport::Notifications.subscribe 'instantiation.active_record'.freeze do |*args|
     event = ActiveSupport::Notifications::Event.new(*args)
     record_count = event.payload[:record_count]
-    class_name = normalize_name(event.payload[:class_name])
-    tags = { class: class_name }
+    tags = { active_record_class_name: event.payload[:class_name] }
 
-    Metric.count 'rails.active_record.instantiation.count', record_count, tags
-    Metric.count "rails.active_record.instantiation.count.#{class_name}", record_count, tags
+    Metric.count 'rails.active_record.instantiation.count'.freeze, record_count, tags
   end
 end

data/lib/traxor/rails.rb

@@ -1,12 +1,12 @@
+require 'traxor/rack'
+
 module Traxor
   class Rails < ::Rails::Engine
-    initializer 'traxor.setup' do |app|
-      Traxor.configure do |config|
-        config.logger = ::Rails.logger
+    initializer 'traxor.setup'.freeze do |app|
+      if ::Rails.env.development? || ::Rails.env.test?
+        Traxor.initialize_logger(::Rails.root.join('log'.freeze, 'traxor.log'.freeze))
       end
 
-      require 'traxor/rack/middleware/pre'
-      require 'traxor/rack/middleware/post'
       app.config.middleware.insert 0, Traxor::Rack::Middleware::Pre
       app.config.middleware.use Traxor::Rack::Middleware::Post
 
@@ -25,8 +25,8 @@ module Traxor
       require 'traxor/faraday' if defined?(Faraday)
 
       if defined?(Sidekiq)
+        require 'traxor/sidekiq'
         ::Sidekiq.server_middleware do |chain|
-          require 'traxor/sidekiq'
           chain.add Traxor::Sidekiq
         end
       end

data/lib/traxor/sidekiq.rb

@@ -3,18 +3,18 @@ require 'benchmark'
 module Traxor
   class Sidekiq
     def call(worker, _job, queue)
-      tags = { worker: Traxor.normalize_name(worker.class.name), queue: Traxor.normalize_name(queue) }
+      tags = Traxor::Tags.sidekiq = {
+        sidekiq_worker: worker.class.name,
+        sidekiq_queue: queue
+      }
       begin
         time = Benchmark.ms do
           yield
         end
-        Metric.measure 'sidekiq.worker.duration', "#{time.round(2)}ms", tags
-        Metric.measure "sidekiq.worker.duration.#{tags[:worker]}", "#{time.round(2)}ms", tags
-        Metric.count 'sidekiq.worker.count', 1, tags
-        Metric.count "sidekiq.worker.count.#{tags[:worker]}", 1, tags
+        Metric.measure 'sidekiq.worker.duration'.freeze, "#{time.round(2)}ms", tags
+        Metric.count 'sidekiq.worker.count'.freeze, 1, tags
       rescue StandardError
-        Metric.count 'sidekiq.worker.exception.count', 1, tags
-        Metric.count "sidekiq.worker.exception.count.#{tags[:worker]}", 1, tags
+        Metric.count 'sidekiq.worker.exception.count'.freeze, 1, tags
         raise
       end
     end

data/lib/traxor/tags.rb

@@ -0,0 +1,11 @@
+require 'active_support/core_ext/module/attribute_accessors_per_thread'
+
+module Traxor
+  module Tags
+    thread_mattr_accessor :controller, :sidekiq
+
+    def self.all
+      (controller || {}).merge(sidekiq || {})
+    end
+  end
+end

data/lib/traxor/version.rb

@@ -1,3 +1,3 @@
 module Traxor
-  VERSION = '0.1.13'.freeze
+  VERSION = '0.1.14'.freeze
 end

data/lib/traxor.rb

@@ -1,25 +1,22 @@
-require 'active_support/configurable'
-require 'active_support/inflector/inflections'
 require 'logger'
 require 'traxor/faraday' if defined?(Faraday)
 require 'traxor/metric'
-require 'traxor/rails' if defined?(Rails)
+require 'traxor/rack' if defined?(Rack)
+require 'traxor/rails' if defined?(Rails::Engine)
 require 'traxor/sidekiq' if defined?(Sidekiq)
+require 'traxor/tags'
 require 'traxor/version'
 
 module Traxor
-  include ActiveSupport::Configurable
-  config_accessor :logger do
-    Logger.new(STDOUT).tap do |l|
-      l.level = Logger::INFO
-    end
-  end
-
-  def self.configure
-    yield config
+  def self.logger
+    defined?(@logger) ? @logger : initialize_logger
   end
 
-  def self.normalize_name(value)
-    value.to_s.gsub(/::/, '.').underscore
+  def self.initialize_logger(log_target = STDOUT)
+    @logger = Logger.new(log_target, level: Logger::INFO, progname: name)
+    @logger.formatter = proc do |severity, _time, progname, msg|
+      "[#{progname}] #{severity} : #{msg}\n"
+    end
+    @logger
   end
 end

data/traxor.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'faraday'
+  spec.add_development_dependency 'lois'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rails'
@@ -32,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'sidekiq'
   spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traxor
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Ryan Hansen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: lois
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -201,7 +229,9 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
+- ".reek"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -209,6 +239,7 @@ files:
 - Rakefile
 - bin/code_climate_reek
 - bin/console
+- bin/lois
 - bin/rake
 - bin/reek
 - bin/rspec
@@ -217,13 +248,17 @@ files:
 - lib/traxor.rb
 - lib/traxor/faraday.rb
 - lib/traxor/metric.rb
+- lib/traxor/rack.rb
+- lib/traxor/rack/middleware.rb
 - lib/traxor/rack/middleware/post.rb
 - lib/traxor/rack/middleware/pre.rb
+- lib/traxor/rack/middleware/queue_time.rb
 - lib/traxor/rails.rb
 - lib/traxor/rails/action_controller.rb
 - lib/traxor/rails/action_mailer.rb
 - lib/traxor/rails/active_record.rb
 - lib/traxor/sidekiq.rb
+- lib/traxor/tags.rb
 - lib/traxor/version.rb
 - traxor.gemspec
 homepage: https://github.com/ketiko/traxor