traxor 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba90b5e65121c02ec1a419a5e945c43802be46121fec69315c38a0bb327e01f5
-  data.tar.gz: 4ab56d1a501ce39e962f0108b745f758e3597a152d10d92122ea26e6605863ba
+  metadata.gz: 351b5aa13db42137c948cfb5b917b2ba74362cd6963c00f53670050c9c062ca9
+  data.tar.gz: 5a8c4de34ba013e1d18332c9deaa3bfa064297ea98eec68783fbab8de3fbd8c3
 SHA512:
-  metadata.gz: 31548d74364f241fe3286c46b79018eb0b1e948922cb13f6e8f77db3493d0f17c809d0e19c2bfb4b1adb3fff14b8da302367285eee3f796ef0e649955739571c
-  data.tar.gz: 77f30d4b35fc7f4f29ebe2243a903d7f7876f393013fe25d274c0d6ecd97549238e4ef38bd981e39c965474930856113bd2f9f8f195c4d32af35469cd6ebfcce
+  metadata.gz: d95fdaf39f628c8d4a4fc0247589e92a971d0a70d8f0d406a800997a51ca5f6612d263a5904dd33197e8a6bfca6af40a8a059823ad1ff7e38a57ce28939c2219
+  data.tar.gz: 350f0c8ecdea1bf76449e6f3c51b2c43f9447f619e8e4c16653eb3201dbd3fa9fda5853624e3ec80ec39b31508efa72688bc881582f867a2bf8ee8fe15ee3a51

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    traxor (0.1.18)
+    traxor (0.1.19)
       activesupport (>= 5.0)
 
 GEM
@@ -248,4 +248,4 @@ DEPENDENCIES
   traxor!
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

data/README.md

@@ -2,7 +2,7 @@
 
 A tool for logging ruby application performance metrics to the [Akkeris](https://github.com/akkeris) platform.
 
-Supported Gems:
+Supported Frameworks:
 
  - Rack
  - Sidekiq
@@ -17,7 +17,7 @@ How does this help me?
 It logs things that help you troubleshoot performance issues.  Just some of the things it can help with:
 
  - How much time is spent in rack middleware?
- - Are requests getting backed up in the [queue](https://devcenter.heroku.com/articles/http-routing#heroku-headers)
+ - Are requests getting backed up in the [queue](https://devcenter.heroku.com/articles/http-routing#heroku-headers)?
  - How many ActiveRecord models are loaded in a request?
  - Which sidekiq jobs are the slowest?
  - How much time is being spent in calls to external services?

data/gemfiles/active_support_5_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    traxor (0.1.18)
+    traxor (0.1.19)
       activesupport (>= 5.0)
 
 GEM
@@ -249,4 +249,4 @@ DEPENDENCIES
   traxor!
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

data/gemfiles/active_support_5_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    traxor (0.1.18)
+    traxor (0.1.19)
       activesupport (>= 5.0)
 
 GEM
@@ -249,4 +249,4 @@ DEPENDENCIES
   traxor!
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

data/gemfiles/active_support_5_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    traxor (0.1.18)
+    traxor (0.1.19)
       activesupport (>= 5.0)
 
 GEM
@@ -249,4 +249,4 @@ DEPENDENCIES
   traxor!
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

data/lib/traxor/faraday.rb

@@ -18,7 +18,9 @@ module Traxor
   end
 end
 
-ActiveSupport::Notifications.subscribe('request.faraday') do |*args|
-  event = ActiveSupport::Notifications::Event.new(*args)
-  Traxor::Faraday.record(event)
+if Traxor.enabled? && Traxor.scopes.include?(:faraday)
+  ActiveSupport::Notifications.subscribe('request.faraday') do |*args|
+    event = ActiveSupport::Notifications::Event.new(*args)
+    Traxor::Faraday.record(event)
+  end
 end

data/lib/traxor/metric.rb

@@ -27,6 +27,8 @@ module Traxor
     end
 
     def self.log(string)
+      return unless Traxor.enabled?
+
       logger.info(normalize_values(string))
     end
 

data/lib/traxor/rails/action_controller.rb

@@ -38,12 +38,14 @@ module Traxor
   end
 end
 
-ActiveSupport::Notifications.subscribe 'start_processing.action_controller' do |*args|
-  event = ActiveSupport::Notifications::Event.new(*args)
-  Traxor::Rails::ActionController.set_controller_tags(event)
-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)
+  end
 
-ActiveSupport::Notifications.subscribe 'process_action.action_controller' do |*args|
-  event = ActiveSupport::Notifications::Event.new(*args)
-  Traxor::Rails::ActionController.record(event)
+  ActiveSupport::Notifications.subscribe 'process_action.action_controller' do |*args|
+    event = ActiveSupport::Notifications::Event.new(*args)
+    Traxor::Rails::ActionController.record(event)
+  end
 end

data/lib/traxor/rails/action_mailer.rb

@@ -15,7 +15,9 @@ module Traxor
   end
 end
 
-ActiveSupport::Notifications.subscribe 'deliver.action_mailer' do |*args|
-  event = ActiveSupport::Notifications::Event.new(*args)
-  Traxor::Rails::ActionMailer.record(event)
+if Traxor.enabled? && Traxor.scopes.include?(:action_mailer)
+  ActiveSupport::Notifications.subscribe 'deliver.action_mailer' do |*args|
+    event = ActiveSupport::Notifications::Event.new(*args)
+    Traxor::Rails::ActionMailer.record(event)
+  end
 end

data/lib/traxor/rails/active_record.rb

@@ -36,12 +36,14 @@ module Traxor
   end
 end
 
-ActiveSupport::Notifications.subscribe 'sql.active_record' do |*args|
-  event = ActiveSupport::Notifications::Event.new(*args)
-  Traxor::Rails::ActiveRecord.record(event)
-end
+if Traxor.enabled? && Traxor.scopes.include?(:active_record)
+  ActiveSupport::Notifications.subscribe 'sql.active_record' do |*args|
+    event = ActiveSupport::Notifications::Event.new(*args)
+    Traxor::Rails::ActiveRecord.record(event)
+  end
 
-ActiveSupport::Notifications.subscribe 'instantiation.active_record' do |*args|
-  event = ActiveSupport::Notifications::Event.new(*args)
-  Traxor::Rails::ActiveRecord.record_instantiations(event)
+  ActiveSupport::Notifications.subscribe 'instantiation.active_record' do |*args|
+    event = ActiveSupport::Notifications::Event.new(*args)
+    Traxor::Rails::ActiveRecord.record_instantiations(event)
+  end
 end

data/lib/traxor/rails/engine.rb

@@ -10,28 +10,34 @@ module Traxor
           Traxor.initialize_logger(::Rails.root.join('log', 'traxor.log'))
         end
 
-        require 'traxor/rack'
-        app.config.middleware.insert 0, Traxor::Rack::Middleware::Pre
-        app.config.middleware.use Traxor::Rack::Middleware::Post
+        if Traxor.enabled?
+          if Traxor.scopes.include?(:rack)
+            require 'traxor/rack'
+            app.config.middleware.insert 0, Traxor::Rack::Middleware::Pre
+            app.config.middleware.use Traxor::Rack::Middleware::Post
+          end
 
-        ActiveSupport.on_load :action_controller do
-          require 'traxor/rails/action_controller'
-        end
-        ActiveSupport.on_load :active_record do
-          require 'traxor/rails/active_record'
-        end
-        ActiveSupport.on_load :action_mailer do
-          require 'traxor/rails/action_mailer'
+          ActiveSupport.on_load :action_controller do
+            require 'traxor/rails/action_controller'
+          end
+          ActiveSupport.on_load :active_record do
+            require 'traxor/rails/active_record'
+          end
+          ActiveSupport.on_load :action_mailer do
+            require 'traxor/rails/action_mailer'
+          end
         end
       end
 
       config.before_configuration do
-        require 'traxor/faraday' if defined?(Faraday)
+        if Traxor.enabled?
+          require 'traxor/faraday' if defined?(Faraday)
 
-        if defined?(Sidekiq)
-          require 'traxor/sidekiq'
-          ::Sidekiq.server_middleware do |chain|
-            chain.add Traxor::Sidekiq
+          if defined?(Sidekiq) && Traxor.scopes.include?(:sidekiq)
+            require 'traxor/sidekiq'
+            ::Sidekiq.server_middleware do |chain|
+              chain.add Traxor::Sidekiq
+            end
           end
         end
       end

data/lib/traxor/version.rb

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

data/lib/traxor.rb

@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
 require 'logger'
-require 'traxor/faraday' if defined?(Faraday)
-require 'traxor/metric'
-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'
+require 'active_support/core_ext/object/blank'
 
 module Traxor
+  DEFAULT_SCOPES = 'rack,action_controller,action_mailer,active_record,faraday,sidekiq'
+
   def self.logger
     defined?(@logger) ? @logger : initialize_logger
   end
@@ -21,4 +17,25 @@ module Traxor
     end
     @logger
   end
+
+  def self.enabled?
+    @enabled ||= ENV.fetch('TRAXOR_ENABLED', true).present?
+  end
+
+  def self.scopes
+    @scopes ||= ENV
+                .fetch('TRAXOR_SCOPES', DEFAULT_SCOPES)
+                .to_s
+                .downcase
+                .split(',')
+                .map(&:to_sym)
+  end
 end
+
+require 'traxor/faraday' if defined?(Faraday)
+require 'traxor/metric'
+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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traxor
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Ryan Hansen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -278,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Log metrics to akkeris platform