From 106c30f3eb7688b71ad23d6f3a53725818c31c27 Mon Sep 17 00:00:00 2001
From: Stephanie Hobson <sjhobson@gmail.com>
Date: Wed, 19 Jul 2023 19:38:49 -0700
Subject: [PATCH] Add Adjust support to product_download

---
 .../banners/mobile/firefox-app-store.html     |   4 +-
 .../banners/mobile/focus-app-store.html       |   4 +-
 .../firefox/browsers/chromebook.html          |   2 +-
 .../compare/includes/download-menu-list.html  |   4 +-
 .../templates/firefox/browsers/index.html     |   4 +-
 .../firefox/browsers/mobile/index.html        |  12 +-
 .../templates/firefox/enterprise/index.html   |  20 +-
 .../templates/firefox/home/index-master.html  |   8 +-
 .../includes/download-unsupported.html        |   6 +-
 .../templates/firefox/products/index.html     |   8 +-
 .../datalayer-productdownload-init.es6.js     |  20 ++
 .../js/base/datalayer-productdownload.es6.js  | 109 +++++++--
 .../all/all-downloads-unified-init.es6.js     |  13 --
 media/static-bundles.json                     |   3 +-
 .../spec/base/datalayer-productdownload.js    | 213 +++++++++++++-----
 15 files changed, 310 insertions(+), 120 deletions(-)
 create mode 100644 media/js/base/datalayer-productdownload-init.es6.js

diff --git a/bedrock/base/templates/includes/banners/mobile/firefox-app-store.html b/bedrock/base/templates/includes/banners/mobile/firefox-app-store.html
index 39a7abd1ba3..f7757123872 100644
--- a/bedrock/base/templates/includes/banners/mobile/firefox-app-store.html
+++ b/bedrock/base/templates/includes/banners/mobile/firefox-app-store.html
@@ -21,8 +21,8 @@ <h2 class="c-banner-title">{{ ftl('banner-firefox-app-store-title') }}</h2>
             <p class="show-android">{{ ftl('banner-firefox-app-store-free-google-play') }}</p>
             <p class="show-ios">{{ ftl('banner-firefox-app-store-free-app-store') }}</p>
           </div>
-          <a class="c-banner-button show-android" href="{{ android_url }}" data-link-type="download" data-download-os="Android" data-download-location="Banner">{{ ftl('ui-view') }}</a>
-          <a class="c-banner-link show-ios" href="{{ ios_url }}" data-link-type="download" data-download-os="iOS" data-download-location="Banner">{{ ftl('ui-view') }}</a>
+          <a class="c-banner-button show-android ga-product-download" href="{{ android_url }}" data-link-type="download" data-download-os="Android" data-download-location="Banner">{{ ftl('ui-view') }}</a>
+          <a class="c-banner-link show-ios ga-product-download" href="{{ ios_url }}" data-link-type="download" data-download-os="iOS" data-download-location="Banner">{{ ftl('ui-view') }}</a>
       </div>
     </div>
   </div>
diff --git a/bedrock/base/templates/includes/banners/mobile/focus-app-store.html b/bedrock/base/templates/includes/banners/mobile/focus-app-store.html
index 3dc3fa9ffd6..26516386f47 100644
--- a/bedrock/base/templates/includes/banners/mobile/focus-app-store.html
+++ b/bedrock/base/templates/includes/banners/mobile/focus-app-store.html
@@ -21,8 +21,8 @@ <h2 class="c-banner-title">{{ ftl('banner-firefox-focus-app-store-title') }}</h2
             <p class="show-android">{{ ftl('banner-firefox-app-store-free-google-play') }}</p>
             <p class="show-ios">{{ ftl('banner-firefox-app-store-free-app-store') }}</p>
           </div>
-          <a class="c-banner-button show-android" href="{{ android_url }}" data-link-type="download" data-download-os="Android" data-download-location="Banner">{{ ftl('ui-view') }}</a>
-          <a class="c-banner-link show-ios" href="{{ ios_url }}" data-link-type="download" data-download-os="iOS" data-download-location="Banner">{{ ftl('ui-view') }}</a>
+          <a class="c-banner-button show-android ga-product-download" href="{{ android_url }}" data-link-type="download" data-download-os="Android" data-download-location="Banner">{{ ftl('ui-view') }}</a>
+          <a class="c-banner-link show-ios ga-product-download" href="{{ ios_url }}" data-link-type="download" data-download-os="iOS" data-download-location="Banner">{{ ftl('ui-view') }}</a>
       </div>
     </div>
   </div>
diff --git a/bedrock/firefox/templates/firefox/browsers/chromebook.html b/bedrock/firefox/templates/firefox/browsers/chromebook.html
index 9158af04dcb..c4629ec4b13 100644
--- a/bedrock/firefox/templates/firefox/browsers/chromebook.html
+++ b/bedrock/firefox/templates/firefox/browsers/chromebook.html
@@ -43,7 +43,7 @@ <h1 class="mzp-u-title-xl">{{ ftl('browsers-chromebook-get-firefox-browser') }}<
     <h4 class="mzp-c-menu-list-title">{{ ftl('browsers-chromebook-dropdown-copy') }}</h4>
     <ul class="mzp-c-menu-list-list download-platform-list">
       <li class="mzp-c-menu-list-item">
-        <a href="{{ firefox_adjust_url('android', 'firefox-browsers-faq') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">
+        <a href="{{ firefox_adjust_url('android', 'firefox-browsers-faq') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">
           {{ ftl('browsers-chromebook-browsers-chromebook-get-firefox-for') }}
           <p><small>{{ ftl('browsers-chromebook-x86-based-chromebook') }}</small></p>
         </a>
diff --git a/bedrock/firefox/templates/firefox/browsers/compare/includes/download-menu-list.html b/bedrock/firefox/templates/firefox/browsers/compare/includes/download-menu-list.html
index acf07b15cf6..1a783033cf8 100644
--- a/bedrock/firefox/templates/firefox/browsers/compare/includes/download-menu-list.html
+++ b/bedrock/firefox/templates/firefox/browsers/compare/includes/download-menu-list.html
@@ -20,7 +20,7 @@ <h5 class="mzp-c-menu-list-title">{{ get_browser }}</h5>
     {# Download link should be locale neutral see issue 7982 #}
     <li class="mzp-c-menu-list-item"><a href="/firefox/download/thanks/" data-link-type="Desktop" data-download-os="Desktop" data-download-version="standard">{{ get_desktop }}</a></li>
   <!--<![endif]-->
-    <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android"> {{ get_android }}</a></li>
-    <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ get_ios }}</a></li>
+    <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android"> {{ get_android }}</a></li>
+    <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ get_ios }}</a></li>
   </ul>
 </div>
diff --git a/bedrock/firefox/templates/firefox/browsers/index.html b/bedrock/firefox/templates/firefox/browsers/index.html
index 3de28b9a68e..c7f584095ae 100644
--- a/bedrock/firefox/templates/firefox/browsers/index.html
+++ b/bedrock/firefox/templates/firefox/browsers/index.html
@@ -130,8 +130,8 @@ <h2 class="c-landing-grid-title "><a class="mzp-c-cta-link" href="{{ url('firefo
       <div id="menu-mobile-wrapper"  class="mzp-c-menu-list mzp-t-cta mzp-t-download">
         <h3 class="mzp-c-menu-list-title">{{ ftl('firefox-browsers-download-for-mobile') }}</h3>
         <ul class="mzp-c-menu-list-list" id="menu-mobile">
-          <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-browsers-android') }}</a></li>
-          <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-browsers-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-browsers-android') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ firefox_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-browsers-ios') }}</a></li>
           <li class="mzp-c-menu-list-item t-getapp"><a href="{{ url('firefox.mobile.get-app') }}" data-cta-type="link" data-cta-text="Get App Mobile">{{ ftl('firefox-browsers-send-me-a-link') }}</a></li>
         </ul>
       </div>
diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/index.html b/bedrock/firefox/templates/firefox/browsers/mobile/index.html
index 74586b6c376..6a316d9ac6b 100644
--- a/bedrock/firefox/templates/firefox/browsers/mobile/index.html
+++ b/bedrock/firefox/templates/firefox/browsers/mobile/index.html
@@ -77,10 +77,10 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.androi
       <p>{{ ftl('browsers-mobile-infinitely-customizable-private') }}</p>
 
       <p id="android-download">
-        <a class="mzp-c-cta-link" href="{{ firefox_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Download" data-download-version="android" data-download-os="Android">{{ ftl('browsers-mobile-download') }}</a>
+        <a class="mzp-c-cta-link ga-product-download" href="{{ firefox_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Download" data-download-version="android" data-download-os="Android">{{ ftl('browsers-mobile-download') }}</a>
       </p>
 
-      <p><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.mobile.android') }}" data-cta-type="link" data-cta-text="Android Learn More">{{ ftl('ui-learn-more') }}</a></p>
+      <p><a class="mzp-c-cta-link ga-product-download" href="{{ url('firefox.browsers.mobile.android') }}" data-cta-type="link" data-cta-text="Android Learn More">{{ ftl('ui-learn-more') }}</a></p>
     </div>
 
     <div class="c-landing-grid-item">
@@ -89,10 +89,10 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.ios')
       <p>{{ ftl('browsers-mobile-get-enhanced-tracking-protection') }}</p>
 
       <p id="ios-download">
-        <a class="mzp-c-cta-link" href="{{ firefox_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Download" data-download-version="ios" data-download-os="iOS">{{ ftl('browsers-mobile-download') }}</a>
+        <a class="mzp-c-cta-link ga-product-download" href="{{ firefox_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Download" data-download-version="ios" data-download-os="iOS">{{ ftl('browsers-mobile-download') }}</a>
       </p>
 
-      <p><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.mobile.ios') }}" data-cta-type="link" data-cta-text="iOS Learn More">{{ ftl('ui-learn-more') }}</a></p>
+      <p><a class="mzp-c-cta-link ga-product-download" href="{{ url('firefox.browsers.mobile.ios') }}" data-cta-type="link" data-cta-text="iOS Learn More">{{ ftl('ui-learn-more') }}</a></p>
     </div>
 
     <div class="c-landing-grid-item">
@@ -103,8 +103,8 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.focus'
       <div id="menu-focus-wrapper"  class="mzp-c-menu-list mzp-t-cta mzp-t-download">
         <h3 class="mzp-c-menu-list-title">{{ ftl('browsers-mobile-download') }}</h3>
         <ul class="mzp-c-menu-list-list" id="menu-mobile">
-          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('browsers-mobile-android') }}</a></li>
-          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('browsers-mobile-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('android', 'firefox_browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('browsers-mobile-android') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('ios', 'firefox_browsers') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('browsers-mobile-ios') }}</a></li>
         </ul>
       </div>
 
diff --git a/bedrock/firefox/templates/firefox/enterprise/index.html b/bedrock/firefox/templates/firefox/enterprise/index.html
index e95f22a54e7..71e83d88f37 100644
--- a/bedrock/firefox/templates/firefox/enterprise/index.html
+++ b/bedrock/firefox/templates/firefox/enterprise/index.html
@@ -139,22 +139,22 @@ <h3 class="enterprise-download-title">{{ ftl('firefox-enterprise-windows-64-bit'
             <h4 class="mzp-c-menu-list-title">{{ ftl('firefox-enterprise-select-your-download') }}</h4>
             <ul class="mzp-c-menu-list-list download-platform-list">
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64" data-display-name="Firefox">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64" data-display-name="Firefox">
                   {{ ftl('firefox-enterprise-firefox-browser') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-msi-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64-msi" data-display-name="Firefox">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-msi-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64-msi" data-display-name="Firefox">
                   {{ ftl('firefox-enterprise-firefox-browser-msi-installer') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64" data-display-name="Firefox Extended Support Release">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64" data-display-name="Firefox Extended Support Release">
                   {{ ftl('firefox-enterprise-firefox-extended-support-release') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-esr-msi-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64-msi" data-display-name="Firefox Extended Support Release">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-msi-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64-msi" data-display-name="Firefox Extended Support Release">
                   {{ ftl('firefox-enterprise-firefox-extended-support-release-msi') }}
                 </a>
               </li>
@@ -182,12 +182,12 @@ <h3 class="enterprise-download-title">{{ ftl('firefox-enterprise-macos') }}</h3>
             <h4 class="mzp-c-menu-list-title">{{ ftl('firefox-enterprise-select-your-download') }}</h4>
             <ul class="mzp-c-menu-list-list download-platform-list">
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="osx" data-display-name="Firefox">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="osx" data-display-name="Firefox">
                   {{ ftl('firefox-enterprise-firefox-browser') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="osx" data-display-name="Firefox Extended Support Release">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="osx" data-display-name="Firefox Extended Support Release">
                   {{ ftl('firefox-enterprise-firefox-extended-support-release') }}
                 </a>
               </li>
@@ -214,22 +214,22 @@ <h3 class="enterprise-download-title">{{ ftl('firefox-enterprise-windows-32-bit'
             <h4 class="mzp-c-menu-list-title">{{ ftl('firefox-enterprise-select-your-download') }}</h4>
             <ul class="mzp-c-menu-list-list download-platform-list">
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win" data-display-name="Firefox">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win" data-display-name="Firefox">
                   {{ ftl('firefox-enterprise-firefox-browser') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-msi-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win-msi" data-display-name="Firefox">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-msi-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win-msi" data-display-name="Firefox">
                   {{ ftl('firefox-enterprise-firefox-browser-msi-installer') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win" data-display-name="Firefox Extended Support Release">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win" data-display-name="Firefox Extended Support Release">
                   {{ ftl('firefox-enterprise-firefox-extended-support-release') }}
                 </a>
               </li>
               <li class="mzp-c-menu-list-item">
-                <a class="download-link" href="https://download.mozilla.org/?product=firefox-esr-msi-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win-msi" data-display-name="Firefox Extended Support Release">
+                <a class="download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-msi-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win-msi" data-display-name="Firefox Extended Support Release">
                   {{ ftl('firefox-enterprise-firefox-extended-support-release-msi') }}
                 </a>
               </li>
diff --git a/bedrock/firefox/templates/firefox/home/index-master.html b/bedrock/firefox/templates/firefox/home/index-master.html
index e0427012460..09be459c2ec 100644
--- a/bedrock/firefox/templates/firefox/home/index-master.html
+++ b/bedrock/firefox/templates/firefox/home/index-master.html
@@ -135,11 +135,11 @@ <h4>{{ ftl('firefox-home-get-trackers-off') }}</h4>
         <h5 class="mzp-c-menu-list-title">{{ ftl('firefox-home-download-the-browser') }}</h5>
         <ul class="mzp-c-menu-list-list" id="menu-browsers">
           {# Direct users on unsupported OSes to the /new/ page, where they can read EOL messaging (see issue 13317) #}
-          <li class="mzp-c-menu-list-item menu-desktop-unsupported"><a href="{{ url('firefox.new') }}" data-cta-type="link" data-cta-text="Firefox Desktop">{{ ftl('firefox-home-desktop') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-desktop-unsupported"><a href="{{ url('firefox.new') }}" class="ga-product-download"  data-cta-type="link" data-cta-text="Firefox Desktop">{{ ftl('firefox-home-desktop') }}</a></li>
           {# Download link should be locale neutral see issue 7982 #}
-          <li class="mzp-c-menu-list-item menu-desktop"><a href="/firefox/download/thanks/" data-link-type="Desktop" data-download-os="Desktop" data-download-version="standard" data-link-name="Trackers">{{ ftl('firefox-home-desktop') }}</a></li>
-          <li class="mzp-c-menu-list-item menu-android"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android" data-link-name="Trackers"> {{ ftl('firefox-home-android') }}</a></li>
-          <li class="mzp-c-menu-list-item menu-ios"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS" data-link-name="Trackers">{{ ftl('firefox-home-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-desktop"><a href="/firefox/download/thanks/" class="ga-product-download" data-link-type="Desktop" data-download-os="Desktop" data-download-version="standard" data-link-name="Trackers">{{ ftl('firefox-home-desktop') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-android"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" class="ga-product-download"  rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android" data-link-name="Trackers"> {{ ftl('firefox-home-android') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-ios"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" class="ga-product-download"  rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS" data-link-name="Trackers">{{ ftl('firefox-home-ios') }}</a></li>
         </ul>
       </div>
       <p id="test-fbc" class="js-fx-only"><a class="mzp-c-cta-link" href="https://addons.mozilla.org/firefox/addon/facebook-container/{{ referrals }}">{{ ftl('firefox-home-get-the-facebook-container') }}</a></p>
diff --git a/bedrock/firefox/templates/firefox/includes/download-unsupported.html b/bedrock/firefox/templates/firefox/includes/download-unsupported.html
index ad3ac7f4d78..1c5e864bfef 100644
--- a/bedrock/firefox/templates/firefox/includes/download-unsupported.html
+++ b/bedrock/firefox/templates/firefox/includes/download-unsupported.html
@@ -19,12 +19,12 @@
   <p>{{ ftl('download-button-please-download-esr') }}</p>
   <div class="download-platform-list">
     <p>
-      <a class="mzp-c-button mzp-t-product download-link os_win64" href="https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64" data-display-name="Firefox Extended Support Release">
+      <a class="mzp-c-button mzp-t-product download-link os_win64 ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&os=win64&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win64" data-display-name="Firefox Extended Support Release">
         {{ ftl('download-firefox-esr-64') }}
       </a>
     </p>
     <p>
-      <a class="mzp-c-button mzp-t-product download-link os_win" href="https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win" data-display-name="Firefox Extended Support Release">
+      <a class="mzp-c-button mzp-t-product download-link os_win ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&os=win&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="win" data-display-name="Firefox Extended Support Release">
         {{ ftl('download-firefox-esr-32') }}
       </a>
     </p>
@@ -42,7 +42,7 @@
   <p>{{ ftl('download-button-please-download-esr') }}</p>
 
   <div class="download-platform-list">
-    <a class="mzp-c-button mzp-t-product download-link" href="https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&os=osx&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="osx" data-display-name="Firefox Extended Support Release">
+    <a class="mzp-c-button mzp-t-product download-link ga-product-download" href="https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&os=osx&lang={{ LANG }}" data-link-type="download" data-download-os="Desktop" data-download-version="osx" data-display-name="Firefox Extended Support Release">
       {{ ftl('download-firefox-esr') }}
     </a>
   </div>
diff --git a/bedrock/firefox/templates/firefox/products/index.html b/bedrock/firefox/templates/firefox/products/index.html
index f109c3a4606..d76676d7f9e 100644
--- a/bedrock/firefox/templates/firefox/products/index.html
+++ b/bedrock/firefox/templates/firefox/products/index.html
@@ -89,8 +89,8 @@ <h3 class="mzp-c-menu-list-title">{{ ftl('download-button-download') }}</h3>
             {# Download link should be locale neutral see issue 7982 #}
             <li class="mzp-c-menu-list-item menu-desktop"><a href="/firefox/download/thanks/" data-link-type="Desktop" data-download-os="Desktop" data-download-version="standard">{{ ftl('firefox-products-desktop') }}</a></li>
           <!--<![endif]-->
-          <li class="mzp-c-menu-list-item menu-android"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-products-android') }}</a></li>
-          <li class="mzp-c-menu-list-item menu-ios"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-products-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-android"><a href="{{ firefox_adjust_url('android', 'firefox_home') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-products-android') }}</a></li>
+          <li class="mzp-c-menu-list-item menu-ios"><a href="{{ firefox_adjust_url('ios', 'firefox_home') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-products-ios') }}</a></li>
         </ul>
       </div>
       <p><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.index') }}" data-cta-type="link" data-cta-text="See all browsers">{{ ftl('firefox-products-see-all-browsers') }}</a></p>
@@ -140,8 +140,8 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.focus'
       <div id="menu-focus-wrapper"  class="mzp-c-menu-list mzp-t-cta mzp-t-download">
         <h3 class="mzp-c-menu-list-title">{{ ftl('download-button-download') }}</h3>
         <ul class="mzp-c-menu-list-list" id="menu-mobile">
-          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('android', 'firefox_products') }}" rel="external noopener" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-products-android') }}</a></li>
-          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('ios', 'firefox_products') }}" rel="external noopener" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-products-ios') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('android', 'firefox_products') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="Android" data-download-version="android" data-download-os="Android">{{ ftl('firefox-products-android') }}</a></li>
+          <li class="mzp-c-menu-list-item"><a href="{{ focus_adjust_url('ios', 'firefox_products') }}" rel="external noopener" class="ga-product-download" data-link-type="download" data-display-name="iOS" data-download-version="ios" data-download-os="iOS">{{ ftl('firefox-products-ios') }}</a></li>
         </ul>
       </div>
 
diff --git a/media/js/base/datalayer-productdownload-init.es6.js b/media/js/base/datalayer-productdownload-init.es6.js
new file mode 100644
index 00000000000..56865891224
--- /dev/null
+++ b/media/js/base/datalayer-productdownload-init.es6.js
@@ -0,0 +1,20 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+import TrackProductDownload from './datalayer-productdownload.es6';
+
+// init tracking on links
+// other methods of triggering downloads (example: /thanks) are handled separately
+const productLinks = document.querySelectorAll('.ga-product-download');
+for (let i = 0; i < productLinks.length; ++i) {
+    productLinks[i].addEventListener(
+        'click',
+        function (event) {
+            TrackProductDownload.handleLink(event);
+        },
+        false
+    );
+}
diff --git a/media/js/base/datalayer-productdownload.es6.js b/media/js/base/datalayer-productdownload.es6.js
index fde2ecd686e..dfbb563f585 100644
--- a/media/js/base/datalayer-productdownload.es6.js
+++ b/media/js/base/datalayer-productdownload.es6.js
@@ -7,8 +7,10 @@
 const TrackProductDownload = {};
 const prodURL = /^https:\/\/download.mozilla.org/;
 const stageURL = /^https:\/\/bouncer-bouncer.stage.mozaws.net/;
-const appStoreURL = /^https:\/\/itunes.apple.com/;
+const iTunesURL = /^https:\/\/itunes.apple.com/;
+const appStoreURL = /^https:\/\/apps.apple.com/;
 const playStoreURL = /^https:\/\/play.google.com/;
+const adjustURL = /^https:\/\/app.adjust.com/;
 
 if (typeof window.dataLayer === 'undefined') {
     window.dataLayer = [];
@@ -21,11 +23,13 @@ if (typeof window.dataLayer === 'undefined') {
  */
 TrackProductDownload.isValidDownloadURL = (downloadURL) => {
     if (typeof downloadURL === 'string') {
-        if (prodURL.test(downloadURL) || stageURL.test(downloadURL)) {
-            return true;
-        } else if (
+        if (
+            prodURL.test(downloadURL) ||
+            stageURL.test(downloadURL) ||
+            iTunesURL.test(downloadURL) ||
             appStoreURL.test(downloadURL) ||
-            playStoreURL.test(downloadURL)
+            playStoreURL.test(downloadURL) ||
+            adjustURL.test(downloadURL)
         ) {
             return true;
         } else {
@@ -40,6 +44,8 @@ TrackProductDownload.isValidDownloadURL = (downloadURL) => {
  * Create the product_download event object
  * @param {string} product
  * @param {string} platform
+ * @param {string} method - direct, store, or adjust
+ * @param {string} linkUrl
  * @param {string} release_channel - optional, we don't get it for ios downloads
  * @param {string} download_language - optional, we don't get it for mobile downloads
  * @returns {Object}
@@ -47,15 +53,23 @@ TrackProductDownload.isValidDownloadURL = (downloadURL) => {
 TrackProductDownload.getEventObject = (
     product,
     platform,
-    release_channel = '',
-    download_language = ''
+    method,
+    linkUrl,
+    release_channel = false,
+    download_language = false
 ) => {
     const eventObject = {};
     eventObject['event'] = 'product_download';
     eventObject['product'] = product;
     eventObject['platform'] = platform;
-    eventObject['release_channel'] = release_channel;
-    eventObject['download_language'] = download_language;
+    eventObject['method'] = method;
+    eventObject['link_url'] = linkUrl;
+    if (release_channel) {
+        eventObject['release_channel'] = release_channel;
+    }
+    if (download_language) {
+        eventObject['download_language'] = download_language;
+    }
     return eventObject;
 };
 
@@ -95,38 +109,101 @@ TrackProductDownload.getEventFromUrl = (downloadURL) => {
         let platform = params.os;
         platform = platform === 'osx' ? 'macos' : platform;
         // release channel is second word of product param
-        // (except for release which says 'latest' but we want 'release')
+        // (except for latest or sub installer - we update those to say release)
         const releaseChannel =
-            productSplit[1] === 'latest' ? 'release' : productSplit[1];
+            productSplit[1] === ('latest' || 'stub')
+                ? 'release'
+                : productSplit[1];
 
         eventObject = TrackProductDownload.getEventObject(
             product,
             platform,
+            'direct',
+            downloadURL,
             releaseChannel,
             params.lang
         );
     } else if (playStoreURL.test(downloadURL)) {
         const idParam = params.id;
-        let androidRelease = 'release';
-        // Android Play Store, need to check release, beta, nightly
+        let androidProduct = 'unrecognized';
+        let androidRelease = '';
+
         switch (idParam) {
+            case 'org.mozilla.firefox':
+                androidProduct = 'firefox';
+                androidRelease = 'release';
+                break;
             case 'org.mozilla.fenix':
+                androidProduct = 'firefox';
                 androidRelease = 'nightly';
                 break;
             case 'org.mozilla.firefox_beta':
+                androidProduct = 'firefox';
                 androidRelease = 'beta';
                 break;
+            case 'org.mozilla.focus':
+                androidProduct = 'focus';
+                break;
+            case 'org.mozilla.klar':
+                androidProduct = 'klar';
+                break;
+            case 'com.ideashower.readitlater.pro':
+                androidProduct = 'pocket';
+                break;
         }
+
         eventObject = TrackProductDownload.getEventObject(
-            'firefox',
+            androidProduct,
             'android',
+            'store',
+            downloadURL,
             androidRelease
         );
-    } else if (appStoreURL.test(downloadURL)) {
+    } else if (appStoreURL.test(downloadURL) || iTunesURL.test(downloadURL)) {
+        let iosProduct = 'unrecognized';
+        if (downloadURL.includes('/id989804926')) {
+            iosProduct = 'firefox';
+        } else if (downloadURL.includes('/id1055677337')) {
+            iosProduct = 'focus';
+        } else if (downloadURL.includes('/id1073435754')) {
+            iosProduct = 'klar';
+        } else if (downloadURL.includes('/id309601447')) {
+            iosProduct = 'pocket';
+        }
         // Apple App Store
         eventObject = TrackProductDownload.getEventObject(
-            'firefox',
+            iosProduct,
             'ios',
+            'store',
+            downloadURL,
+            'release'
+        );
+    } else if (adjustURL.test(downloadURL)) {
+        // product
+        let adjustProduct = 'unrecognized';
+        if (downloadURL.includes('/2uo1qc')) {
+            adjustProduct = 'firefox';
+        } else if (downloadURL.includes('/b8s7qo')) {
+            adjustProduct = 'focus';
+        } else if (downloadURL.includes('/jfcx5x')) {
+            adjustProduct = 'klar';
+        } else if (downloadURL.includes('/m54twk')) {
+            adjustProduct = 'pocket';
+        }
+
+        // platform
+        let adjustPlatform = 'mobile';
+        if (downloadURL.includes('play.google.com')) {
+            adjustPlatform = 'android';
+        } else if (downloadURL.includes('itunes.apple.com')) {
+            adjustPlatform = 'ios';
+        }
+
+        eventObject = TrackProductDownload.getEventObject(
+            adjustProduct,
+            adjustPlatform,
+            'adjust',
+            downloadURL,
             'release'
         );
     }
diff --git a/media/js/firefox/all/all-downloads-unified-init.es6.js b/media/js/firefox/all/all-downloads-unified-init.es6.js
index 568dac713b7..0a77ad0567d 100644
--- a/media/js/firefox/all/all-downloads-unified-init.es6.js
+++ b/media/js/firefox/all/all-downloads-unified-init.es6.js
@@ -19,9 +19,6 @@ import MzpSideMenu from '@mozilla-protocol/core/protocol/js/sidemenu';
         const downloadButton = document.getElementById(
             'download-button-primary'
         );
-        const mobileDownloadButtons = document.querySelectorAll(
-            '.ga-product-download'
-        );
 
         function showHelpModal(modalContent, modalTitle, eventLabel) {
             MzpModal.createModal(this, modalContent, {
@@ -79,16 +76,6 @@ import MzpSideMenu from '@mozilla-protocol/core/protocol/js/sidemenu';
             },
             false
         );
-
-        for (let i = 0; i < mobileDownloadButtons.length; i++) {
-            mobileDownloadButtons[i].addEventListener(
-                'click',
-                function (event) {
-                    TrackProductDownload.handleLink(event);
-                },
-                false
-            );
-        }
     }
 
     Mozilla.run(onLoad);
diff --git a/media/static-bundles.json b/media/static-bundles.json
index 93706fae30c..bfc577eaba4 100644
--- a/media/static-bundles.json
+++ b/media/static-bundles.json
@@ -1747,7 +1747,8 @@
     {
       "files": [
         "js/base/core-datalayer.js",
-        "js/base/core-datalayer-init.js"
+        "js/base/core-datalayer-init.js",
+        "js/base/datalayer-productdownload-init.es6.js"
       ],
       "name": "data"
     },
diff --git a/tests/unit/spec/base/datalayer-productdownload.js b/tests/unit/spec/base/datalayer-productdownload.js
index d190c80d086..6aaf738fc2f 100644
--- a/tests/unit/spec/base/datalayer-productdownload.js
+++ b/tests/unit/spec/base/datalayer-productdownload.js
@@ -36,11 +36,11 @@ describe('TrackProductDownload.isValidDownloadURL', function () {
         );
         expect(testPlayStoreURL).toBe(true);
     });
-    it('should not accept Adjust as a valid URL', function () {
+    it('should recognize Adjust as a valid URL', function () {
         let testAdjustURL = TrackProductDownload.isValidDownloadURL(
             'https://app.adjust.com/2uo1qc?redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.firefox&campaign=www.mozilla.org&adgroup=mobile-android-page'
         );
-        expect(testAdjustURL).toBe(false);
+        expect(testAdjustURL).toBe(true);
     });
     it('should not accept a random link to mozilla.org as a valid URL', function () {
         let testRandomURL = TrackProductDownload.isValidDownloadURL(
@@ -56,12 +56,16 @@ describe('TrackProductDownload.getEventObject', function () {
             event: 'product_download',
             product: 'testProduct',
             platform: 'testPlatform',
+            method: 'testMethod',
+            link_url: 'linkURL',
             release_channel: 'testReleaseChannel',
             download_language: 'testDownloadLanguage'
         };
         let testFullEventObject = TrackProductDownload.getEventObject(
             'testProduct',
             'testPlatform',
+            'testMethod',
+            'linkURL',
             'testReleaseChannel',
             'testDownloadLanguage'
         );
@@ -72,12 +76,14 @@ describe('TrackProductDownload.getEventObject', function () {
             event: 'product_download',
             product: 'testProduct',
             platform: 'testPlatform',
-            release_channel: '',
-            download_language: ''
+            method: 'testMethod',
+            link_url: 'linkURL'
         };
         let testShortEventObject = TrackProductDownload.getEventObject(
             'testProduct',
-            'testPlatform'
+            'testPlatform',
+            'testMethod',
+            'linkURL'
         );
         expect(testShortEventObject).toEqual(testShortEventExpectedObject);
     });
@@ -86,133 +92,229 @@ describe('TrackProductDownload.getEventObject', function () {
 describe('TrackProductDownload.getEventFromUrl', function () {
     // product
     it('should identify product for Firefox Desktop', function () {
-        let testProductDesktop = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang=en-US&_gl=1&234*_ga*ABC'
         );
-        expect(testProductDesktop['product']).toBe('firefox');
+        expect(testEvent['product']).toBe('firefox');
     });
-    it('should identify product for Firefox iOS', function () {
-        let testProductIOS = TrackProductDownload.getEventFromUrl(
+    it('should identify product for Firefox in the App Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://itunes.apple.com/app/firefox-private-safe-browser/id989804926'
         );
-        expect(testProductIOS['product']).toBe('firefox');
+        expect(testEvent['product']).toBe('firefox');
     });
-    it('should identify product for Firefox Android', function () {
-        let testProductAndroid = TrackProductDownload.getEventFromUrl(
+    it('should identify product for Firefox in the Play Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://play.google.com/store/apps/details?id=org.mozilla.firefox&referrer=utm_source%3Dmozilla%26utm_medium%3DReferral%26utm_campaign%3Dmozilla-org'
         );
-        expect(testProductAndroid['product']).toBe('firefox');
+        expect(testEvent['product']).toBe('firefox');
+    });
+    it('should identify product for Firefox with Adjust', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/2uo1qc'
+        );
+        expect(testEvent['product']).toBe('firefox');
+    });
+    it('should identify product for Pocket in the App Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://itunes.apple.com/{country}/app/pocket-save-read-grow/id309601447'
+        );
+        expect(testEvent['product']).toBe('pocket');
+    });
+    it('should identify product for Pocket in the Play Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://play.google.com/store/apps/details?id=com.ideashower.readitlater.pro'
+        );
+        expect(testEvent['product']).toBe('pocket');
+    });
+    it('should identify product for Pocket with Adjust', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/m54twk'
+        );
+        expect(testEvent['product']).toBe('pocket');
+    });
+    it('should identify product for Focus in the App Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://itunes.apple.com/{country}/app/firefox-focus-privacy-browser/id1055677337'
+        );
+        expect(testEvent['product']).toBe('focus');
+    });
+    it('should identify product for Focus in the Play Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://play.google.com/store/apps/details?id=org.mozilla.focus'
+        );
+        expect(testEvent['product']).toBe('focus');
+    });
+    it('should identify product for Focus with Adjust', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/b8s7qo'
+        );
+        expect(testEvent['product']).toBe('focus');
+    });
+    it('should identify product for Klar in the App Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://itunes.apple.com/{country}/app/klar-by-firefox/id1073435754'
+        );
+        expect(testEvent['product']).toBe('klar');
+    });
+    it('should identify product for Klar in the Play Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://play.google.com/store/apps/details?id=org.mozilla.klar'
+        );
+        expect(testEvent['product']).toBe('klar');
+    });
+    it('should identify product for Klar with Adjust', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/jfcx5x'
+        );
+        expect(testEvent['product']).toBe('klar');
+    });
+    it('should identify product as unrecognized if Adjust link is not found', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/aabbcc'
+        );
+        expect(testEvent['product']).toBe('unrecognized');
+    });
+    it('should identify product as unrecognized if App Store link is not found', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://itunes.apple.com/us/app/49th-parallel-coffee-roasters/id1567407403'
+        );
+        expect(testEvent['product']).toBe('unrecognized');
+    });
+    it('should identify product as unrecognized if Play Store link is not found', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://play.google.com/store/apps/details?id=co.tapcart.app.id_rBugj0qbKV'
+        );
+        expect(testEvent['product']).toBe('unrecognized');
     });
     // platform
-    it('should identify platform for Windows', function () {
-        let testPlatformWindows = TrackProductDownload.getEventFromUrl(
+    it('should identify platform for Firefox for Windows', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang=en-US&_gl=1&234*_ga*ABC'
         );
-        expect(testPlatformWindows['platform']).toBe('win64');
+        expect(testEvent['platform']).toBe('win64');
     });
-    it('should identify platform for MacOS', function () {
-        let testPlatformMacOS = TrackProductDownload.getEventFromUrl(
+    it('should identify platform for Firefox for MacOS', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=osx&lang=en-US'
         );
-        expect(testPlatformMacOS['platform']).toBe('macos');
+        expect(testEvent['platform']).toBe('macos');
     });
-    it('should identify platform for Linux', function () {
-        let testPlatformLinux = TrackProductDownload.getEventFromUrl(
+    it('should identify platform for Firefox for Linux', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US'
         );
-        expect(testPlatformLinux['platform']).toBe('linux64');
+        expect(testEvent['platform']).toBe('linux64');
     });
-    it('should identify platform for iOS', function () {
-        let testPlatformIOS = TrackProductDownload.getEventFromUrl(
+    it('should identify platform for Firefox in the App Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://itunes.apple.com/app/firefox-private-safe-browser/id989804926'
         );
-        expect(testPlatformIOS['platform']).toBe('ios');
+        expect(testEvent['platform']).toBe('ios');
     });
-    it('should identify platform for Android', function () {
-        let testPlatformAndroid = TrackProductDownload.getEventFromUrl(
+    it('should identify platform for Firefox in the Play Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://play.google.com/store/apps/details?id=org.mozilla.firefox&referrer=utm_source%3Dmozilla%26utm_medium%3DReferral%26utm_campaign%3Dmozilla-org'
         );
-        expect(testPlatformAndroid['platform']).toBe('android');
+        expect(testEvent['platform']).toBe('android');
+    });
+    it('should identify platform for Adjust link direct to Play Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/b8s7qo?redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus&campaign=www.mozilla.org&adgroup=mobile-focus-page'
+        );
+        expect(testEvent['platform']).toBe('android');
+    });
+    it('should identify platform for Adjust link direct to App Store', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/b8s7qo?redirect=https%3A%2F%2Fitunes.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337&campaign=www.mozilla.org&adgroup=mobile-focus-page'
+        );
+        expect(testEvent['platform']).toBe('ios');
     });
     // release channel
     it('should identify release_channel for Firefox Release', function () {
-        let testReleaseRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang=en-US&_gl=1&234*_ga*ABC'
         );
-        expect(testReleaseRelease['release_channel']).toBe('release');
+        expect(testEvent['release_channel']).toBe('release');
     });
     it('should identify release_channel for Firefox Beta', function () {
-        let testBetaRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-beta-latest-ssl&os=osx&lang=en-US'
         );
-        expect(testBetaRelease['release_channel']).toBe('beta');
+        expect(testEvent['release_channel']).toBe('beta');
     });
     it('should identify release_channel for Firefox Dev Edition', function () {
-        let testDevRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-devedition-latest-ssl&os=osx&lang=en-US'
         );
-        expect(testDevRelease['release_channel']).toBe('devedition');
+        expect(testEvent['release_channel']).toBe('devedition');
     });
     it('should identify release_channel for Firefox Nightly', function () {
-        let testNightlyRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=osx&lang=en-US'
         );
-        expect(testNightlyRelease['release_channel']).toBe('nightly');
+        expect(testEvent['release_channel']).toBe('nightly');
     });
     it('should identify release_channel for Firefox ESR', function () {
-        let testNightlyRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=en-US'
         );
-        expect(testNightlyRelease['release_channel']).toBe('esr');
+        expect(testEvent['release_channel']).toBe('esr');
     });
     it('should identify release_channel for Firefox iOS', function () {
-        let testIOSRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://itunes.apple.com/app/firefox-private-safe-browser/id989804926'
         );
-        expect(testIOSRelease['release_channel']).toBe('release');
+        expect(testEvent['release_channel']).toBe('release');
     });
     it('should identify release_channel for Firefox Android Release', function () {
-        let testAndroidRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://play.google.com/store/apps/details?id=org.mozilla.firefox&referrer=utm_source%3Dmozilla%26utm_medium%3DReferral%26utm_campaign%3Dmozilla-org'
         );
-        expect(testAndroidRelease['release_channel']).toBe('release');
+        expect(testEvent['release_channel']).toBe('release');
     });
     it('should identify release_channel for Firefox Android Beta', function () {
-        let testAndroidBetaRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://play.google.com/store/apps/details?id=org.mozilla.firefox_beta'
         );
-        expect(testAndroidBetaRelease['release_channel']).toBe('beta');
+        expect(testEvent['release_channel']).toBe('beta');
     });
     it('should identify release_channel for Firefox Android Nightly', function () {
-        let testAndroidNightlyRelease = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://play.google.com/store/apps/details?id=org.mozilla.fenix'
         );
-        expect(testAndroidNightlyRelease['release_channel']).toBe('nightly');
+        expect(testEvent['release_channel']).toBe('nightly');
     });
     // language
     it('should identify en-US for Firefox Desktop', function () {
-        let testLanguageDesktop = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang=en-US&_gl=1&234*_ga*ABC'
         );
-        expect(testLanguageDesktop['download_language']).toBe('en-US');
+        expect(testEvent['download_language']).toBe('en-US');
     });
     it('should identify DE for Firefox Desktop', function () {
-        let testLanguageDesktop = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://download.mozilla.org/?product=firefox-latest-ssl&os=osx&lang=de'
         );
-        expect(testLanguageDesktop['download_language']).toBe('de');
+        expect(testEvent['download_language']).toBe('de');
     });
     it('should not identify language for Firefox iOS', function () {
-        let testLanguageIOS = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://itunes.apple.com/app/firefox-private-safe-browser/id989804926'
         );
-        expect(testLanguageIOS['download_language']).toBeFalsy();
+        expect(testEvent['download_language']).toBeFalsy();
     });
     it('should not identify language for Firefox Android', function () {
-        let testLanguageAndroid = TrackProductDownload.getEventFromUrl(
+        let testEvent = TrackProductDownload.getEventFromUrl(
             'https://play.google.com/store/apps/details?id=org.mozilla.firefox&referrer=utm_source%3Dmozilla%26utm_medium%3DReferral%26utm_campaign%3Dmozilla-org'
         );
-        expect(testLanguageAndroid['download_language']).toBeFalsy();
+        expect(testEvent['download_language']).toBeFalsy();
+    });
+    it('should not identify language for an Adjust link', function () {
+        let testEvent = TrackProductDownload.getEventFromUrl(
+            'https://app.adjust.com/2uo1qc'
+        );
+        expect(testEvent['download_language']).toBeFalsy();
     });
 });
 
@@ -258,6 +360,9 @@ describe('TrackProductDownload.handleLink', function () {
             event: 'product_download',
             product: 'firefox',
             platform: 'win64',
+            method: 'direct',
+            link_url:
+                'https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang=en-CA',
             release_channel: 'release',
             download_language: 'en-CA'
         });