Merge pull request #1690 from ruby-agent/RUBY-1916_activerecord_travi…

…s_failure Record Datastore update metrics on touch in ActiveRecord >= 5.1.6
newrelic · Apr 5, 2018 · fdee4eb · fdee4eb
2 parents ddbe054 + 8d4b5b0
commit fdee4eb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/lib/new_relic/agent/instrumentation/active_record_5.rb b/lib/new_relic/agent/instrumentation/active_record_5.rb
@@ -31,6 +31,11 @@
       ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActiveRecord::Base, ::ActiveRecord::Relation)
       ::ActiveRecord::Base.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions
       ::ActiveRecord::Relation.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::RelationExtensions
+
+      if ::ActiveRecord::VERSION::MINOR.to_i == 1 &&
+         ::ActiveRecord::VERSION::TINY.to_i >= 6
+        ::ActiveRecord::Base.prepend ::NewRelic::Agent::Instrumentation::ActiveRecordPrepend::BaseExtensions516
+      end
     end
   end
 end
diff --git a/lib/new_relic/agent/instrumentation/active_record_prepend.rb b/lib/new_relic/agent/instrumentation/active_record_prepend.rb
@@ -24,6 +24,19 @@ def save!(*args, &blk)
           end
         end
 
+        module BaseExtensions516
+          # In ActiveRecord v5.0.0 through v5.1.5, touch() will call
+          # update_all() and cause us to record a transaction.
+          # Starting in v5.1.6, this call no longer happens. We'll
+          # have to set the database metrics explicitly now.
+          #
+          def touch(*args, &blk)
+            ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
+              super
+            end
+          end
+        end
+
         module RelationExtensions
           def update_all(*args, &blk)
             ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
@@ -58,4 +71,4 @@ def pluck(*args, &blk)
       end
     end
   end
-end
+end
diff --git a/test/multiverse/suites/active_record/Envfile b/test/multiverse/suites/active_record/Envfile
@@ -13,14 +13,14 @@ if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
   mysql_vsn = '~>0.4.4'
 
   gemfile <<-RB
-    gem 'activerecord', '~> 5.2.0.beta2'
+    gem 'activerecord', '~> 5.2.0.rc2'
     gem 'minitest', '~> 5.2.3'
     gem '#{mysql_gem}', '#{mysql_vsn}'
     #{boilerplate_gems}
   RB
 
   gemfile <<-RB
-    gem 'activerecord', '~> 5.1.0'
+    gem 'activerecord', '~> 5.1.6'
     gem 'minitest', '~> 5.2.3'
     gem '#{mysql_gem}', '#{mysql_vsn}'
     #{boilerplate_gems}