From e921c3a2363705097b7c3d88deea6b945378ecc3 Mon Sep 17 00:00:00 2001
From: jmax-fearless <66315527+jmax-fearless@users.noreply.github.com>
Date: Thu, 2 Sep 2021 11:24:37 -0400
Subject: [PATCH] SRCH-2324 update newrelic_rpm (#771)

- Bumped newrelic_rpm to 6.15.0 and ran `bundle update newrelic_rpm`

- Set backport_fast_active_record_connection_lookup to true.  As of
  6.5, newrelic_rpm defaults this to false, but recommends setting it to
  true unless that causes problems with other gems' monkey-patching of
  ActiveRecord.
---
 Gemfile             | 2 +-
 Gemfile.lock        | 4 ++--
 config/newrelic.yml | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7a06dae835..6bc9681568 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,7 @@ gem 'flickraw', '~> 0.9.9'
 gem 'active_scaffold', '~> 3.5.0'
 gem 'active_scaffold_export', git: 'https://github.com/naaano/active_scaffold_export'
 gem "recaptcha", '~> 4.6.3', :require => "recaptcha/rails"
-gem 'newrelic_rpm', '~> 5.0.0'
+gem 'newrelic_rpm', '~> 6.15.0'
 gem 'american_date', '~> 1.1.1'
 gem 'sass', '~> 3.3.0'
 gem 'sass-rails', '~> 5.0.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index c18a17091b..1ad9f37fa9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -500,7 +500,7 @@ GEM
     mysql2 (0.4.10)
     naught (1.1.0)
     net-http-persistent (2.9.4)
-    newrelic_rpm (5.0.0.342)
+    newrelic_rpm (6.15.0)
     nio4r (2.5.8)
     nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
@@ -869,7 +869,7 @@ DEPENDENCIES
   medusa!
   mysql2 (~> 0.4.4)
   net-http-persistent (~> 2.9.3)
-  newrelic_rpm (~> 5.0.0)
+  newrelic_rpm (~> 6.15.0)
   nokogiri (~> 1.11.1)
   omniauth-rails_csrf_protection (~> 0.1.2)
   omniauth_login_dot_gov!
diff --git a/config/newrelic.yml b/config/newrelic.yml
index bbc51e3bd0..dcd3fde9b4 100644
--- a/config/newrelic.yml
+++ b/config/newrelic.yml
@@ -6,6 +6,7 @@
   apdex_t: <%= Rails.application.secrets.newrelic[:apdex_t] || 0.5 %>
   capture_params: false
   disable_curb: true
+  backport_fast_active_record_connection_lookup: true
   transaction_tracer:
     enabled: true
     transaction_threshold: apdex_f