From 689e1177d5099f0a0ed887c8b083cf039d421b8c Mon Sep 17 00:00:00 2001
From: Kelson Warner <kelson.warner@amplitude.com>
Date: Fri, 11 Sep 2020 12:32:53 -0700
Subject: [PATCH 1/7] GROWTH-1094 add logAttributionCapturedEvent option to log
 Amplitude Events when attribution data is captured

---
 src/amplitude-client.js       | 23 ++++++++++++++++++++---
 src/constants.js              |  4 +++-
 src/options.js                |  1 +
 test/browser/amplitudejs.html |  2 +-
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/amplitude-client.js b/src/amplitude-client.js
index 78722ddd..aba906ce 100644
--- a/src/amplitude-client.js
+++ b/src/amplitude-client.js
@@ -354,14 +354,28 @@ AmplitudeClient.prototype._migrateUnsentEvents = function _migrateUnsentEvents(c
  * @private
  */
 AmplitudeClient.prototype._trackParamsAndReferrer = function _trackParamsAndReferrer() {
+  let utmProperties;
+  let referrerProperties
+  let gclidProperties;
   if (this.options.includeUtm) {
-    this._initUtmData();
+    utmProperties = this._initUtmData();
   }
   if (this.options.includeReferrer) {
-    this._saveReferrer(this._getReferrer());
+    referrerProperties = this._saveReferrer(this._getReferrer());
   }
   if (this.options.includeGclid) {
-    this._saveGclid(this._getUrlParams());
+    gclidProperties = this._saveGclid(this._getUrlParams());
+  }
+  if (this.options.logAttributionCapturedEvent) {
+    const attributionProperties = Object.assign(
+      {},
+      utmProperties,
+      referrerProperties,
+      gclidProperties
+    );
+    if (Object.keys(attributionProperties).length > 0) {
+      this.logEvent(Constants.ATTRIBUTION_EVENT, attributionProperties);
+    }
   }
 };
 
@@ -675,6 +689,7 @@ AmplitudeClient.prototype._initUtmData = function _initUtmData(queryParams, cook
   cookieParams = cookieParams || this.cookieStorage.get('__utmz');
   var utmProperties = getUtmData(cookieParams, queryParams);
   _sendParamsReferrerUserProperties(this, utmProperties);
+  return utmProperties;
 };
 
 /**
@@ -739,6 +754,7 @@ AmplitudeClient.prototype._saveGclid = function _saveGclid(urlParams) {
   }
   var gclidProperties = {'gclid': gclid};
   _sendParamsReferrerUserProperties(this, gclidProperties);
+  return gclidProperties;
 };
 
 /**
@@ -778,6 +794,7 @@ AmplitudeClient.prototype._saveReferrer = function _saveReferrer(referrer) {
     'referring_domain': this._getReferringDomain(referrer)
   };
   _sendParamsReferrerUserProperties(this, referrerInfo);
+  return referrerInfo;
 };
 
 /**
diff --git a/src/constants.js b/src/constants.js
index 45bf6984..db68297e 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -37,5 +37,7 @@ export default {
   UTM_MEDIUM: 'utm_medium',
   UTM_CAMPAIGN: 'utm_campaign',
   UTM_TERM: 'utm_term',
-  UTM_CONTENT: 'utm_content'
+  UTM_CONTENT: 'utm_content',
+
+  ATTRIBUTION_EVENT: 'attribution captured'
 };
diff --git a/src/options.js b/src/options.js
index 0b16980d..8e4ae039 100644
--- a/src/options.js
+++ b/src/options.js
@@ -30,6 +30,7 @@ export default {
   includeUtm: false,
   language: language.getLanguage(),
   logLevel: 'WARN',
+  logAttributionCapturedEvent: false,
   optOut: false,
   onError: () => {},
   platform,
diff --git a/test/browser/amplitudejs.html b/test/browser/amplitudejs.html
index 4c60be84..79b60de4 100644
--- a/test/browser/amplitudejs.html
+++ b/test/browser/amplitudejs.html
@@ -89,7 +89,7 @@
     }
 </script>
 <script>
-    amplitude.init('a2dbce0e18dfe5f8e74493843ff5c053', null, {includeReferrer: true, includeUtm: true, includeGclid: true}, function() {
+    amplitude.init('a2dbce0e18dfe5f8e74493843ff5c053', null, {includeReferrer: true, includeUtm: true, includeGclid: true, logAttributionCapturedEvent: true}, function() {
         alert(amplitude.options.deviceId);
     });
     amplitude.setVersionName('Web');

From fcf683cd38757969cf06f54891294061ffb8b803 Mon Sep 17 00:00:00 2001
From: Kelson Warner <kelson.warner@amplitude.com>
Date: Wed, 16 Sep 2020 13:32:03 -0700
Subject: [PATCH 2/7] Add spread property

---
 src/amplitude-client.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/amplitude-client.js b/src/amplitude-client.js
index aba906ce..d05b1d6c 100644
--- a/src/amplitude-client.js
+++ b/src/amplitude-client.js
@@ -367,12 +367,11 @@ AmplitudeClient.prototype._trackParamsAndReferrer = function _trackParamsAndRefe
     gclidProperties = this._saveGclid(this._getUrlParams());
   }
   if (this.options.logAttributionCapturedEvent) {
-    const attributionProperties = Object.assign(
-      {},
-      utmProperties,
-      referrerProperties,
-      gclidProperties
-    );
+    const attributionProperties = {
+      ...utmProperties,
+      ...referrerProperties,
+      ...gclidProperties,
+    };
     if (Object.keys(attributionProperties).length > 0) {
       this.logEvent(Constants.ATTRIBUTION_EVENT, attributionProperties);
     }

From 4eec3e849793c13b3686acf8d772ffe6b8ead815 Mon Sep 17 00:00:00 2001
From: Kelson Warner <kelson.warner@amplitude.com>
Date: Wed, 16 Sep 2020 13:50:39 -0700
Subject: [PATCH 3/7] Revert changes to test html

---
 test/browser/amplitudejs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/browser/amplitudejs.html b/test/browser/amplitudejs.html
index 79b60de4..4c60be84 100644
--- a/test/browser/amplitudejs.html
+++ b/test/browser/amplitudejs.html
@@ -89,7 +89,7 @@
     }
 </script>
 <script>
-    amplitude.init('a2dbce0e18dfe5f8e74493843ff5c053', null, {includeReferrer: true, includeUtm: true, includeGclid: true, logAttributionCapturedEvent: true}, function() {
+    amplitude.init('a2dbce0e18dfe5f8e74493843ff5c053', null, {includeReferrer: true, includeUtm: true, includeGclid: true}, function() {
         alert(amplitude.options.deviceId);
     });
     amplitude.setVersionName('Web');

From aa91b722234863970c66ac3f33e92171561bf109 Mon Sep 17 00:00:00 2001
From: Kelson Warner <kelson.warner@amplitude.com>
Date: Fri, 18 Sep 2020 13:57:57 -0700
Subject: [PATCH 4/7] Rename ATTRIBUTION_EVENT to

---
 src/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants.js b/src/constants.js
index db68297e..994349d5 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -39,5 +39,5 @@ export default {
   UTM_TERM: 'utm_term',
   UTM_CONTENT: 'utm_content',
 
-  ATTRIBUTION_EVENT: 'attribution captured'
+  ATTRIBUTION_EVENT: '$attributionCaptured'
 };

From 1d406a4a4e0fe2ca3e8c6427003618f5ceca1bad Mon Sep 17 00:00:00 2001
From: Kelson Warner <kelson.warner@amplitude.com>
Date: Fri, 18 Sep 2020 14:13:14 -0700
Subject: [PATCH 5/7] GROWTH-1094 add missing semicolon

---
 src/amplitude-client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amplitude-client.js b/src/amplitude-client.js
index d05b1d6c..dab89062 100644
--- a/src/amplitude-client.js
+++ b/src/amplitude-client.js
@@ -355,7 +355,7 @@ AmplitudeClient.prototype._migrateUnsentEvents = function _migrateUnsentEvents(c
  */
 AmplitudeClient.prototype._trackParamsAndReferrer = function _trackParamsAndReferrer() {
   let utmProperties;
-  let referrerProperties
+  let referrerProperties;
   let gclidProperties;
   if (this.options.includeUtm) {
     utmProperties = this._initUtmData();

From a6a221e9bec5dd34e82da259914084fe14edeeb6 Mon Sep 17 00:00:00 2001
From: Kelson Warner <kelson.warner@amplitude.com>
Date: Fri, 18 Sep 2020 16:02:26 -0700
Subject: [PATCH 6/7] Rename ATTRIBUTION_CAPTURED

---
 src/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants.js b/src/constants.js
index 994349d5..96fc6f10 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -39,5 +39,5 @@ export default {
   UTM_TERM: 'utm_term',
   UTM_CONTENT: 'utm_content',
 
-  ATTRIBUTION_EVENT: '$attributionCaptured'
+  ATTRIBUTION_EVENT: '[Amplitude] Attribution Captured'
 };

From d39a803ebfd2f4897f0d1a39f636117fffb3fbb6 Mon Sep 17 00:00:00 2001
From: Kelson Warner <kelson.warner@amplitude.com>
Date: Fri, 18 Sep 2020 16:02:33 -0700
Subject: [PATCH 7/7] Add tests for feature

---
 test/amplitude-client.js | 103 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/test/amplitude-client.js b/test/amplitude-client.js
index 53813cb9..81c0990b 100644
--- a/test/amplitude-client.js
+++ b/test/amplitude-client.js
@@ -2952,6 +2952,32 @@ describe('setVersionName', function() {
       });
     });
 
+    it('should log attribution event when referrer is updated if configured', function() {
+      clock.tick(30 * 60 * 1000 + 1);  // force new session
+      amplitude.init(apiKey, undefined, {includeReferrer: true, logAttributionCapturedEvent: true, batchEvents: true, eventUploadThreshold: 2});
+      assert.lengthOf(server.requests, 1);
+      var events = JSON.parse(queryString.parse(server.requests[0].requestBody).e);
+      assert.lengthOf(events, 2);
+      // first event should be identify with initial_referrer and referrer
+      assert.equal(events[0].event_type, '$identify');
+      assert.deepEqual(events[0].user_properties, {
+        '$set': {
+          'referrer': 'https://amplitude.com/contact',
+          'referring_domain': 'amplitude.com'
+        },
+        '$setOnce': {
+          'initial_referrer': 'https://amplitude.com/contact',
+          'initial_referring_domain': 'amplitude.com'
+        }
+      });
+      // second event should be the attribution captured event with referrer information
+      assert.equal(events[1].event_type, constants.ATTRIBUTION_EVENT);
+      assert.deepEqual(events[1].event_properties, {
+        'referrer': 'https://amplitude.com/contact',
+        'referring_domain': 'amplitude.com'
+      });
+    });
+
     it('should not delete unsent events saved to localStorage', function() {
       var existingEvent = '[{"device_id":"test_device_id","user_id":"test_user_id","timestamp":1453769146589,' +
         '"event_id":49,"session_id":1453763315544,"event_type":"clicked","version_name":"Web","platform":"Web"' +
@@ -2993,6 +3019,62 @@ describe('setVersionName', function() {
         }
       });
     });
+
+    it('should log attribution event when UTMs are captured if configured', function() {
+      reset();
+      cookie.set('__utmz', '133232535.1424926227.1.1.utmcct=top&utmccn=new');
+      clock.tick(30 * 60 * 1000 + 1);
+      amplitude.init(apiKey, undefined, {includeUtm: true, logAttributionCapturedEvent: true, batchEvents: true, eventUploadThreshold: 2});
+      assert.lengthOf(server.requests, 1);
+      var events = JSON.parse(queryString.parse(server.requests[0].requestBody).e);
+      // first event should be identify with UTM state
+      assert.equal(events[0].event_type, '$identify');
+      assert.deepEqual(events[0].user_properties, {
+        '$setOnce': {
+          initial_utm_campaign: 'new',
+          initial_utm_content: 'top'
+        },
+        '$set': {
+          utm_campaign: 'new',
+          utm_content: 'top'
+        }
+      });
+      // second event should be the attribution captured event with UTMs populated
+      assert.equal(events[1].event_type, constants.ATTRIBUTION_EVENT);
+      assert.deepEqual(events[1].event_properties, {
+        utm_campaign: 'new',
+        utm_content: 'top'
+      });
+    });
+
+    it('should log attribution event more than once per session if configured and UTMs changes', function() {
+      reset();
+      cookie.set('__utmz', '133232535.1424926227.1.1.utmcct=top&utmccn=new');
+      amplitude.init(apiKey, undefined, {
+        includeUtm: true, logAttributionCapturedEvent: true, saveParamsReferrerOncePerSession: false, batchEvents: true, eventUploadThreshold: 2
+      });
+      // even though same session, utm params are sent again
+      assert.lengthOf(server.requests, 1);
+      var events = JSON.parse(queryString.parse(server.requests[0].requestBody).e);
+            // first event should be identify with UTM state
+      assert.equal(events[0].event_type, '$identify');
+      assert.deepEqual(events[0].user_properties, {
+        '$setOnce': {
+          initial_utm_campaign: 'new',
+          initial_utm_content: 'top'
+        },
+        '$set': {
+          utm_campaign: 'new',
+          utm_content: 'top'
+        }
+      });
+      // second event should be the attribution captured event with UTMs populated
+      assert.equal(events[1].event_type, constants.ATTRIBUTION_EVENT);
+      assert.deepEqual(events[1].event_properties, {
+        utm_campaign: 'new',
+        utm_content: 'top'
+      });
+    });
   });
 
   describe('gatherGclid', function() {
@@ -3050,6 +3132,27 @@ describe('setVersionName', function() {
         '$setOnce': {'initial_gclid': '12345'}
       });
     });
+
+    it('should log attribution event when gclid is captured if configured', () => {
+      clock.tick(30 * 60 * 1000 + 1);
+      amplitude.init(apiKey, undefined, {includeGclid: true, logAttributionCapturedEvent: true, batchEvents: true, eventUploadThreshold: 2});
+
+      assert.lengthOf(server.requests, 1);
+      var events = JSON.parse(queryString.parse(server.requests[0].requestBody).e);
+      assert.lengthOf(events, 2);
+
+      // first event should be identify with gclid
+      assert.equal(events[0].event_type, '$identify');
+      assert.deepEqual(events[0].user_properties, {
+        '$set': {'gclid': '12345'},
+        '$setOnce': {'initial_gclid': '12345'}
+      });
+      // second event should be the attribution captured event with gclid populated
+      assert.equal(events[1].event_type, constants.ATTRIBUTION_EVENT);
+      assert.deepEqual(events[1].event_properties, {
+        'gclid': '12345'
+      })
+    });
   });
 
   describe('logRevenue', function() {