memoize

Author: hannahramadan

lib/new_relic/agent/instrumentation/active_record_helper.rb

@@ -20,7 +20,7 @@ def instrument_additional_methods
         def instrument_save_methods
           ::ActiveRecord::Base.class_eval do
             def newrelic_model_collection_name
-              ::NewRelic::Agent.config[:active_record_use_table_name] ? self.class.table_name : self.class.name
+              NewRelic::Agent::Instrumentation::ActiveRecordHelper.use_table_name? ? self.class.table_name : self.class.name
             end
             private(:newrelic_model_collection_name)
 
@@ -45,7 +45,7 @@ def save!(*args, &blk)
         def instrument_relation_methods
           ::ActiveRecord::Relation.class_eval do
             def newrelic_relation_collection_name
-              ::NewRelic::Agent.config[:active_record_use_table_name] ? self.klass.table_name : self.name
+              NewRelic::Agent::Instrumentation::ActiveRecordHelper.use_table_name? ? self.klass.table_name : self.name
             end
             private(:newrelic_relation_collection_name)
 
@@ -108,6 +108,12 @@ def pluck(*args, &blk)
         TABLE_NAME_CACHE = {}
         @table_name_cache_lock = Mutex.new
 
+        def use_table_name?
+          return @use_table_name if defined?(@use_table_name)
+
+          @use_table_name = NewRelic::Agent.config[:active_record_use_table_name]
+        end
+
         # convert vendor (makara, etc.) wrapper names to their bare names
         # ex: postgresql_makara -> postgresql
         def bare_adapter_name(adapter_name)
@@ -138,7 +144,7 @@ def model_from_splits(splits)
           return unless splits.length == 2
 
           model_name = splits.first
-          return model_name unless NewRelic::Agent.config[:active_record_use_table_name]
+          return model_name unless use_table_name?
 
           table_name_for(model_name) || model_name
         end

lib/new_relic/agent/instrumentation/active_record_prepend.rb

@@ -3,6 +3,7 @@
 # frozen_string_literal: true
 
 require 'new_relic/agent/prepend_supportability'
+require 'new_relic/agent/instrumentation/active_record_helper'
 
 module NewRelic
   module Agent
@@ -42,7 +43,7 @@ def save!(*args, **kwargs, &blk)
           private
 
           def newrelic_model_collection_name
-            ::NewRelic::Agent.config[:active_record_use_table_name] ? self.class.table_name : self.class.name
+            NewRelic::Agent::Instrumentation::ActiveRecordHelper.use_table_name? ? self.class.table_name : self.class.name
           end
         end
 
@@ -69,7 +70,7 @@ def touch(*args, **kwargs, &blk)
           private
 
           def newrelic_model_collection_name
-            ::NewRelic::Agent.config[:active_record_use_table_name] ? self.class.table_name : self.class.name
+            NewRelic::Agent::Instrumentation::ActiveRecordHelper.use_table_name? ? self.class.table_name : self.class.name
           end
         end
 
@@ -107,7 +108,7 @@ def pluck(*args, &blk)
           private
 
           def newrelic_relation_collection_name
-            ::NewRelic::Agent.config[:active_record_use_table_name] ? self.klass.table_name : self.name
+            NewRelic::Agent::Instrumentation::ActiveRecordHelper.use_table_name? ? self.klass.table_name : self.name
           end
         end
       end

test/multiverse/suites/active_record/active_record_test.rb

@@ -14,6 +14,12 @@ def after_setup
     NewRelic::Agent.drop_buffered_data
   end
 
+  def after_teardown
+    super
+    helper = NewRelic::Agent::Instrumentation::ActiveRecordHelper
+    helper.remove_instance_variable(:@use_table_name) if helper.instance_variable_defined?(:@use_table_name)
+  end
+
   def test_metrics_for_calculation_methods
     in_web_transaction do
       Order.count

test/multiverse/suites/active_record_pg/active_record_test.rb

@@ -14,6 +14,12 @@ def after_setup
     NewRelic::Agent.drop_buffered_data
   end
 
+  def after_teardown
+    super
+    helper = NewRelic::Agent::Instrumentation::ActiveRecordHelper
+    helper.remove_instance_variable(:@use_table_name) if helper.instance_variable_defined?(:@use_table_name)
+  end
+
   def test_metrics_for_calculation_methods
     in_web_transaction do
       Order.count

test/new_relic/agent/instrumentation/active_record_helper_test.rb

@@ -17,6 +17,9 @@ module NewRelic::Agent::Instrumentation
   class ActiveRecordHelperTest < Minitest::Test
     def teardown
       ActiveRecordHelper::TABLE_NAME_CACHE.clear
+      if ActiveRecordHelper.instance_variable_defined?(:@use_table_name)
+        ActiveRecordHelper.remove_instance_variable(:@use_table_name)
+      end
     end
 
     def test_product_operation_collection_for_find