From be844253ebfe32d46d74ad70399241d97f8668c6 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Tue, 13 Aug 2019 18:57:49 +0100
Subject: [PATCH 1/2] Enable (optional) Rails APM with Datadog

---
 Gemfile                        | 4 ++++
 Gemfile.lock                   | 4 ++++
 config/initializers/datadog.rb | 5 +++++
 3 files changed, 13 insertions(+)
 create mode 100644 config/initializers/datadog.rb

diff --git a/Gemfile b/Gemfile
index ac2dfd4869..34c1e30f8f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -119,6 +119,10 @@ gem 'jquery-rails', '3.0.4'
 
 gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', ref: '60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c'
 
+group :production, :staging do
+  gem 'ddtrace'
+end
+
 group :test, :development do
   # Pretty printed test output
   gem 'atomic'
diff --git a/Gemfile.lock b/Gemfile.lock
index 403e7bbf7b..c1d683bf13 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -223,6 +223,8 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
+    ddtrace (0.26.0)
+      msgpack
     debugger-linecache (1.2.0)
     deface (1.0.2)
       colorize (>= 0.5.8)
@@ -505,6 +507,7 @@ GEM
       railties (>= 3.1)
     money (5.1.1)
       i18n (~> 0.6.0)
+    msgpack (1.3.1)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
@@ -775,6 +778,7 @@ DEPENDENCIES
   dalli
   database_cleaner (= 0.7.1)
   db2fog
+  ddtrace
   debugger-linecache
   deface (= 1.0.2)
   delayed_job_active_record
diff --git a/config/initializers/datadog.rb b/config/initializers/datadog.rb
new file mode 100644
index 0000000000..ab3c4fd1ac
--- /dev/null
+++ b/config/initializers/datadog.rb
@@ -0,0 +1,5 @@
+if ENV['DATADOG_RAILS_APM']
+  Datadog.configure do |c|
+    c.use :rails, service_name: 'rails'
+  end
+end

From e5e0fcc8870e4ef1b10860e4aced2bfbb5b05bd4 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 14 Aug 2019 08:20:47 +0100
Subject: [PATCH 2/2] Enable DelayedJob APM

---
 config/initializers/datadog.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/datadog.rb b/config/initializers/datadog.rb
index ab3c4fd1ac..4029ebb6d0 100644
--- a/config/initializers/datadog.rb
+++ b/config/initializers/datadog.rb
@@ -1,5 +1,6 @@
 if ENV['DATADOG_RAILS_APM']
   Datadog.configure do |c|
     c.use :rails, service_name: 'rails'
+    c.use :delayed_job, service_name: 'delayed_job'
   end
 end