bullet 4.13.1 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c663f19d349dc9be3a82803ba5e5af344ed0e2
-  data.tar.gz: f996a53cd2ce05eb85f11e55477b41d7b6f841f8
+  metadata.gz: 7f8cac0418ea4a1bb9f8abc6c12e84022f2f118d
+  data.tar.gz: ebdf99115037dec22a5480a63d3bed5f15956dda
 SHA512:
-  metadata.gz: 9fe6ad4a5e0b23c19815a121e8b3dec2989c04f2e81836eba4a096a06b68ae7b33c7c202c1a7a99e697a48bd5bd29711b7ad0a2b17e1d203e32cc964a0e95314
-  data.tar.gz: 77e4bc950eaa4e0e87fd32beaa6f11a605e1e443b0de0f3fbea89798cd11721c3c6a4fa0c9f70bad5c3b7f65586a56b050e38265a21d57d57244e219ab0f8501
+  metadata.gz: 0904f996964a403a495af310bab8a0612e614eb72a71d08646948508c25d4bf36d2b939da65156a5fc81595477820e0f123aa2a88d618fe97e28e81a6b6f8ada
+  data.tar.gz: d491e12ccce38a26a5e3d27d3f6b84acafe34bb7b6aff56b78a8e22a73a5a3abf88443110587de0080e50b32ef70d8ca387eab5faac0b1bec16efed04bf3acc1

data/.gitignore

@@ -12,3 +12,4 @@ benchmark_profile*
 coverage/
 .coveralls.yml
 Gemfile*.lock
+.idea/

data/.travis.yml

@@ -1,19 +1,15 @@
+sudo: false
 language: ruby
 rvm:
-  - 2.1.2
+  - 2.3.0
 gemfile:
+  - Gemfile.rails-5.0
+  - Gemfile.rails-4.2
   - Gemfile.rails-4.1
   - Gemfile.rails-4.0
-  - Gemfile.rails-3.2
-  - Gemfile.rails-3.1
-  - Gemfile.rails-3.0
-  - Gemfile.mongoid-3.1
-  - Gemfile.mongoid-3.0
-  - Gemfile.mongoid-2.8
-  - Gemfile.mongoid-2.7
-  - Gemfile.mongoid-2.6
-  - Gemfile.mongoid-2.5
-  - Gemfile.mongoid-2.4
+  - Gemfile.mongoid-6.0
+  - Gemfile.mongoid-5.0
+  - Gemfile.mongoid-4.0
 env:
   - DB=sqlite
 services:

data/CHANGELOG.md

@@ -1,8 +1,67 @@
 # Next Release
 
-## 4.13.1
-
-* Fix swallow exception issue
+## 5.5.0 (12/30/2016)
+
+* Display http request method #311
+* Add close button to footer
+* Raise an error if bullet does not support AR or Mongoid
+* Avoid double backtrace
+* Fix false alert on counter cache when associations are already loaded #288
+* Fix "false alert" in rails 5 #239
+* Do not support ActiveRecord 3.x and Mongoid 3.x / 4.x anymore
+
+## 5.4.0 (10/09/2016)
+
+* Support rails 5.1
+* Extract stack trace filtering into module
+
+## 5.3.0 (15/08/2016)
+
+* Fix false alert on through association with join sql #301
+* Fix association.target in `through_association` can be singular #302
+* Support `find_by_sql` #303
+* Fix env `REQUEST_URI`
+
+## 5.2.0 (07/26/2016)
+
+* Fix `has_cached_counter?` is not defined in HABTM #297
+* Fix false alert if preloaded association has no records #260
+* Support Rails 5.0.0
+
+## 5.1.0 (05/21/2016)
+
+* Fix false alert when `empty?` used with `counter_cache`
+* Fix `alias_method_chain` deprecation for rails 5
+* Add response handling for non-Rails Rack responses
+* Fix false alert when querying immediately after creation
+* Fix UnusedEagerLoading bug when multiple eager loading query include same objects
+
+## 5.0.0 (01/06/2016)
+
+* Support Rails 5.0.0.beta1
+* Fix `has_many :through` infinite loop issue
+* Support mongoid 5.0.0
+* Do not report association queries immediately after object creation to
+  require a preload
+* Detect `counter_cache` for `has_many :through` association
+* Compatible with `composite_primary_keys` gem
+* Fix AR 4.2 SingularAssociation#reader result can be nil
+* `perform_out_of_channel_notifications` should always be triggered
+* Fix false positive with `belongs_to` -> `belongs_to` for active\_record 4.2
+* Activate active\_record hacks only when Bullet already start
+* Don't execute query when running `to_sql`
+* Send backtrace to `uniform_notifier`
+* Fix sse response check
+* Dynamically delegate available notifiers to UniformNotifier
+* Hotfix nil object when `add_impossible_object`
+* Fix `has_one` then `has_many` associations in rails 4.2
+* Append js and dom to html body in proper position
+
+## 4.14.0 (10/03/2014)
+
+* Support rails 4.2
+* Polish notification output
+* Fix warning: `*' interpreted as argument prefix
 
 ## 4.13.0 (07/19/2014)
 

data/Gemfile.mongoid

@@ -8,7 +8,5 @@ gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'mongoid', github: 'mongoid/mongoid'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
 
 gem 'coveralls', require: false

data/Gemfile.mongoid-4.0

@@ -2,16 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.0.5'
+gem 'rails', '~> 4.0.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'mongoid', '~> 4.0.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
-
-gem 'coveralls', require: false
 
 platforms :rbx do
   gem 'rubysl', '~> 2.0'

data/{Gemfile.mongoid-2.8 → Gemfile.mongoid-5.0}

@@ -2,16 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.2'
+gem 'rails', '~> 4.0.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 2.8'
+gem 'mongoid', '~> 5.1.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
-
-gem 'coveralls', require: false
 
 platforms :rbx do
   gem 'rubysl', '~> 2.0'

data/{Gemfile.mongoid-2.5 → Gemfile.mongoid-6.0}

@@ -2,16 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.2.16'
+gem 'rails', '~> 5.0.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-gem 'mongoid', '~> 2.5.2'
+gem 'mongoid', '~> 6.0.0'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
-
-gem 'coveralls', require: false
 
 platforms :rbx do
   gem 'rubysl', '~> 2.0'

data/Gemfile.rails-4.0

@@ -2,16 +2,13 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.0.8'
+gem 'rails', '~> 4.0.0'
 gem 'sqlite3', platforms: [:ruby]
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
+gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
-
-gem 'coveralls', require: false
 
 platforms :rbx do
   gem 'rubysl', '~> 2.0'

data/Gemfile.rails-4.1

@@ -2,16 +2,13 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.1.4'
+gem 'rails', '~> 4.1.0'
 gem 'sqlite3'
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
+gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
-
-gem 'coveralls', require: false
 
 platforms :rbx do
   gem 'rubysl', '~> 2.0'

data/{Gemfile.rails-3.0 → Gemfile.rails-4.2}

@@ -2,16 +2,13 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.0.20'
-gem 'sqlite3', platforms: [:ruby]
+gem 'rails', '~> 4.2.0'
+gem 'sqlite3'
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
+gem 'tins', '~> 1.6.0', platforms: [:ruby_19]
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
-
-gem 'coveralls', require: false
 
 platforms :rbx do
   gem 'rubysl', '~> 2.0'

data/{Gemfile.rails-3.1 → Gemfile.rails-5.0}

@@ -2,16 +2,12 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 3.1.12'
-gem 'sqlite3', platforms: [:ruby]
+gem 'rails', '5.0.0'
+gem 'sqlite3'
 gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 gem 'activerecord-import'
 
 gem "rspec"
-gem "guard"
-gem "guard-rspec"
-
-gem 'coveralls', require: false
 
 platforms :rbx do
   gem 'rubysl', '~> 2.0'

data/Hacking.md

@@ -23,6 +23,7 @@ Notification instances contain the message that will be displayed, and will
 use a Presenter class to display their message to the user.
 
 So the flow of a request goes like this:
+
 1. Bullet.start_request is called, which resets all the detectors and empties
    the notification collector
 2. The request is handled by Rails, and the installed ActiveRecord extensions

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/bullet.png)](http://badge.fury.io/rb/bullet)
 [![Build Status](https://secure.travis-ci.org/flyerhzm/bullet.png)](http://travis-ci.org/flyerhzm/bullet)
-[![Coverage Status](https://coveralls.io/repos/flyerhzm/bullet/badge.png?branch=master)](https://coveralls.io/r/flyerhzm/bullet)
 <a href="https://codeclimate.com/github/flyerhzm/bullet"><img src="https://codeclimate.com/github/flyerhzm/bullet.png" /></a>
 [![Coderwall Endorse](http://api.coderwall.com/flyerhzm/endorsecount.png)](http://coderwall.com/flyerhzm)
 
@@ -10,10 +9,12 @@ The Bullet gem is designed to help you increase your application's performance b
 
 Best practice is to use Bullet in development mode or custom mode (staging, profile, etc.). The last thing you want is your clients getting alerts about how lazy you are.
 
-Bullet gem now supports **activerecord** >= 3.0 and **mongoid** >= 2.4.1.
+Bullet gem now supports **activerecord** >= 4.0 and **mongoid** >= 4.0.
 
 If you use activerecord 2.x, please use bullet <= 4.5.0
 
+If you use activerecord 3.x, plesae use bullet < 5.5.0
+
 ## External Introduction
 
 * [http://railscasts.com/episodes/372-bullet](http://railscasts.com/episodes/372-bullet)
@@ -36,6 +37,9 @@ or add it into a Gemfile (Bundler):
 gem "bullet", :group => "development"
 ```
 
+**Note**: make sure `bullet` gem is added after activerecord (rails) and
+mongoid.
+
 ## Configuration
 
 Bullet won't do ANYTHING unless you tell it to explicitly. Append to
@@ -53,10 +57,14 @@ config.after_initialize do
                   :receiver => 'your_account@jabber.org',
                   :show_online_status => true }
   Bullet.rails_logger = true
+  Bullet.honeybadger = true
   Bullet.bugsnag = true
   Bullet.airbrake = true
+  Bullet.rollbar = true
   Bullet.add_footer = true
   Bullet.stacktrace_includes = [ 'your_gem', 'your_middleware' ]
+  Bullet.stacktrace_excludes = [ 'their_gem', 'their_middleware' ]
+  Bullet.slack = { webhook_url: 'http://some.slack.url', channel: '#default', username: 'notifier' }
 end
 ```
 
@@ -67,13 +75,18 @@ The code above will enable all seven of the Bullet notification systems:
 * `Bullet.alert`: pop up a JavaScript alert in the browser
 * `Bullet.bullet_logger`: log to the Bullet log file (Rails.root/log/bullet.log)
 * `Bullet.rails_logger`: add warnings directly to the Rails log
+* `Bullet.honeybadger`: add notifications to Honeybadger
+* `Bullet.bugsnag`: add notifications to bugsnag
 * `Bullet.airbrake`: add notifications to airbrake
+* `Bullet.rollbar`: add notifications to rollbar
 * `Bullet.console`: log warnings to your browser's console.log (Safari/Webkit browsers or Firefox w/Firebug installed)
 * `Bullet.growl`: pop up Growl warnings if your system has Growl installed. Requires a little bit of configuration
 * `Bullet.xmpp`: send XMPP/Jabber notifications to the receiver indicated. Note that the code will currently not handle the adding of contacts, so you will need to make both accounts indicated know each other manually before you will receive any notifications. If you restart the development server frequently, the 'coming online' sound for the Bullet account may start to annoy - in this case set :show_online_status to false; you will still get notifications, but the Bullet account won't announce it's online status anymore.
 * `Bullet.raise`: raise errors, useful for making your specs fail unless they have optimized queries
-* `Bullet.add_footer`: adds the details in the bottom left corner of the page
+* `Bullet.add_footer`: adds the details in the bottom left corner of the page. Double click the footer or use close button to hide footer.
 * `Bullet.stacktrace_includes`: include paths with any of these substrings in the stack trace, even if they are not in your main app
+* `Bullet.stacktrace_excludes`: ignore paths with any of these substrings in the stack trace, even if they are not in your main app.
+* `Bullet.slack`: add notifications to slack
 
 Bullet also allows you to disable any of its detectors.
 
@@ -102,6 +115,22 @@ Bullet.add_whitelist :type => :unused_eager_loading, :class_name => "Post", :ass
 Bullet.add_whitelist :type => :counter_cache, :class_name => "Country", :association => :cities
 ```
 
+If you want to skip bullet in some specific controller actions, you can
+do like
+
+```ruby
+class ApplicationController < ActionController::Base
+  around_action :skip_bullet
+
+  def skip_bullet
+    Bullet.enable = false
+    yield
+  ensure
+    Bullet.enable = true
+  end
+end
+```
+
 ## Log
 
 The Bullet log `log/bullet.log` will look something like this:
@@ -153,8 +182,9 @@ The Bullet gem uses rack middleware to profile requests. If you want to use Bull
 ```ruby
 Bullet.profile do
   # do anything
+
+  warnings = Bullet.warnings
 end
-warnings = Bullet.warnings
 ```
 
 ### Work with sinatra
@@ -209,7 +239,9 @@ Bullet outputs some details info, to enable debug mode, set
 
 ## Demo
 
-Bullet is designed to function as you browse through your application in development. To see it in action, follow these steps to create, detect, and fix example query problems.
+Bullet is designed to function as you browse through your application in development. To see it in action,
+you can visit [https://github.com/flyerhzm/bullet_test](https://github.com/flyerhzm/bullet_test) or
+follow these steps to create, detect, and fix example query problems.
 
 1\. Create an example application
 
@@ -302,7 +334,7 @@ model: Post => associations: [comment]
 
 which means there is a N+1 query from the Post object to its Comment association.
 
-In the meanwhile, there's a log appended into `log/bullet.log` file
+In the meantime, there's a log appended into `log/bullet.log` file
 
 ```
 2010-03-07 14:12:18[INFO] N+1 Query in /posts
@@ -429,4 +461,4 @@ Meanwhile, there's a line appended to `log/bullet.log`
   Post => [:comments]
 ```
 
-Copyright (c) 2009 - 2014 Richard Huang (flyerhzm@gmail.com), released under the MIT license
+Copyright (c) 2009 - 2016 Richard Huang (flyerhzm@gmail.com), released under the MIT license

data/bullet.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
 
   s.add_runtime_dependency "activesupport", ">= 3.0.0"
-  s.add_runtime_dependency "uniform_notifier", ">= 1.6.0"
+  s.add_runtime_dependency "uniform_notifier", "~> 1.10.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/bullet/active_record4.rb

@@ -2,35 +2,81 @@ module Bullet
   module ActiveRecord
     def self.enable
       require 'active_record'
+      ::ActiveRecord::Base.class_eval do
+        class <<self
+          alias_method :origin_find_by_sql, :find_by_sql
+          def find_by_sql(sql, binds = [])
+            result = origin_find_by_sql(sql, binds)
+            if Bullet.start?
+              if result.is_a? Array
+                if result.size > 1
+                  Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+                  Bullet::Detector::CounterCache.add_possible_objects(result)
+                elsif result.size == 1
+                  Bullet::Detector::NPlusOneQuery.add_impossible_object(result.first)
+                  Bullet::Detector::CounterCache.add_impossible_object(result.first)
+                end
+              elsif result.is_a? ::ActiveRecord::Base
+                Bullet::Detector::NPlusOneQuery.add_impossible_object(result)
+                Bullet::Detector::CounterCache.add_impossible_object(result)
+              end
+            end
+            result
+          end
+        end
+      end
+
       ::ActiveRecord::Relation.class_eval do
         alias_method :origin_to_a, :to_a
         # if select a collection of objects, then these objects have possible to cause N+1 query.
         # if select only one object, then the only one object has impossible to cause N+1 query.
         def to_a
           records = origin_to_a
-          if records.size > 1
-            Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
-            Bullet::Detector::CounterCache.add_possible_objects(records)
-          elsif records.size == 1
-            Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
-            Bullet::Detector::CounterCache.add_impossible_object(records.first)
+          if Bullet.start?
+            if records.size > 1
+              Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
+              Bullet::Detector::CounterCache.add_possible_objects(records)
+            elsif records.size == 1
+              Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
+              Bullet::Detector::CounterCache.add_impossible_object(records.first)
+            end
           end
           records
         end
       end
 
+      ::ActiveRecord::Persistence.class_eval do
+        def save_with_bullet(*args, &proc)
+          was_new_record = new_record?
+          save_without_bullet(*args, &proc).tap do |result|
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+          end
+        end
+        alias_method_chain :save, :bullet
+
+        def save_with_bullet!(*args, &proc)
+          was_new_record = new_record?
+          save_without_bullet!(*args, &proc).tap do |result|
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(self) if result && was_new_record
+          end
+        end
+        alias_method_chain :save!, :bullet
+      end
+
       ::ActiveRecord::Associations::Preloader.class_eval do
         # include query for one to many associations.
         # keep this eager loadings.
         alias_method :origin_initialize, :initialize
         def initialize(records, associations, preload_scope = nil)
           origin_initialize(records, associations, preload_scope)
-          records = [records].flatten.compact.uniq
-          return if records.empty?
-          records.each do |record|
-            Bullet::Detector::Association.add_object_associations(record, associations)
+          if Bullet.start?
+            records = [records].flatten.compact.uniq
+            return if records.empty?
+            records.each do |record|
+              Bullet::Detector::Association.add_object_associations(record, associations)
+            end
+            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
           end
-          Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
         end
       end
 
@@ -39,11 +85,13 @@ module Bullet
         alias_method :origin_find_with_associations, :find_with_associations
         def find_with_associations
           records = origin_find_with_associations
-          associations = (eager_load_values + includes_values).uniq
-          records.each do |record|
-            Bullet::Detector::Association.add_object_associations(record, associations)
+          if Bullet.start?
+            associations = (eager_load_values + includes_values).uniq
+            records.each do |record|
+              Bullet::Detector::Association.add_object_associations(record, associations)
+            end
+            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
           end
-          Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
           records
         end
       end
@@ -56,9 +104,11 @@ module Bullet
           @bullet_eager_loadings = {}
           records = origin_instantiate(rows)
 
-          @bullet_eager_loadings.each do |klazz, eager_loadings_hash|
-            objects = eager_loadings_hash.keys
-            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(objects, eager_loadings_hash[objects.first].to_a)
+          if Bullet.start?
+            @bullet_eager_loadings.each do |klazz, eager_loadings_hash|
+              objects = eager_loadings_hash.keys
+              Bullet::Detector::UnusedEagerLoading.add_eager_loadings(objects, eager_loadings_hash[objects.first].to_a)
+            end
           end
           records
         end
@@ -67,12 +117,14 @@ module Bullet
         def construct_association(record, join, row)
           result = origin_construct_association(record, join, row)
 
-          associations = join.reflection.name
-          Bullet::Detector::Association.add_object_associations(record, associations)
-          Bullet::Detector::NPlusOneQuery.call_association(record, associations)
-          @bullet_eager_loadings[record.class] ||= {}
-          @bullet_eager_loadings[record.class][record] ||= Set.new
-          @bullet_eager_loadings[record.class][record] << associations
+          if Bullet.start?
+            associations = join.reflection.name
+            Bullet::Detector::Association.add_object_associations(record, associations)
+            Bullet::Detector::NPlusOneQuery.call_association(record, associations)
+            @bullet_eager_loadings[record.class] ||= {}
+            @bullet_eager_loadings[record.class][record] ||= Set.new
+            @bullet_eager_loadings[record.class][record] << associations
+          end
 
           result
         end
@@ -82,20 +134,38 @@ module Bullet
         # call one to many associations
         alias_method :origin_load_target, :load_target
         def load_target
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          end
           origin_load_target
         end
 
+        alias_method :origin_include?, :include?
+        def include?(object)
+          if Bullet.start?
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          end
+          origin_include?(object)
+        end
+      end
+
+      ::ActiveRecord::Associations::HasManyAssociation.class_eval do
         alias_method :origin_empty?, :empty?
         def empty?
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          if Bullet.start? && !loaded? && !has_cached_counter?(@reflection)
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          end
           origin_empty?
         end
+      end
 
-        alias_method :origin_include?, :include?
-        def include?(object)
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-          origin_include?(object)
+      ::ActiveRecord::Associations::HasAndBelongsToManyAssociation.class_eval do
+        alias_method :origin_empty?, :empty?
+        def empty?
+          if Bullet.start? && !loaded?
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          end
+          origin_empty?
         end
       end
 
@@ -104,8 +174,12 @@ module Bullet
         alias_method :origin_reader, :reader
         def reader(force_reload = false)
           result = origin_reader(force_reload)
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
-          Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+          if Bullet.start?
+            unless @inversed
+              Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+              Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+            end
+          end
           result
         end
       end
@@ -115,7 +189,9 @@ module Bullet
 
         def has_cached_counter?(reflection = reflection())
           result = origin_has_cached_counter?(reflection)
-          Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name) unless result
+          if Bullet.start? && !result
+            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
+          end
           result
         end
       end