From edcb4fb203e6fad3eaa2f13c009bd7abe26042b8 Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <kinkade@measurementlab.net>
Date: Tue, 9 Jul 2024 14:35:51 -0600
Subject: [PATCH 1/3] Updates Google Analytics code to GA4

"Universal Analytics" is retired, replaced by Google Analytics 4 (GA4). Our UA
tags are linked to GA4 properties, but we should stop doing that and just use
the native GA4 analytics tag. This PR should do that.
---
 app/index.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/index.html b/app/index.html
index 4ed590d..ff9e8d1 100644
--- a/app/index.html
+++ b/app/index.html
@@ -63,14 +63,14 @@
 		<script src="services/gaugeService.js"></script>
 		<script src="services/mlabService.js"></script>
 	  <script src="app.js"></script>
+	  <!-- Google tag (gtag.js) -->
+	  <script async src="https://www.googletagmanager.com/gtag/js?id=G-WV41BWS391"></script>
 	  <script>
-	   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	   m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	   })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+	   window.dataLayer = window.dataLayer || [];
+	   function gtag(){dataLayer.push(arguments);}
+	   gtag('js', new Date());
 
-	   ga('create', 'UA-56251309-2', 'auto');
-	   ga('send', 'pageview');
+	   gtag('config', 'G-WV41BWS391');
 	  </script>
 	</body>
 </html>

From 3822a8ad54bfe82c09977d0c1c4077aca6edef97 Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <kinkade@measurementlab.net>
Date: Tue, 9 Jul 2024 15:18:53 -0600
Subject: [PATCH 2/3] Explicitly uses Ubuntu distribution Jammy

The Travis-CI build is emitting this error:

"GLIBC_2.27 not found (required by node)"

Presumably the version of node we are using requires some version of glibc that
the default distro, Xenial, doesn't have. This is just an attempt to work
around this issue. It may cause other problems.
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a74e62d..d885985 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: jammy
 language: node_js
 node_js:
 - node
@@ -26,4 +27,4 @@ deploy:
   only: hosting:speedtest
   on:
     branch: sandbox-*
-    condition: "$TRAVIS_EVENT_TYPE == push"
\ No newline at end of file
+    condition: "$TRAVIS_EVENT_TYPE == push"

From cd96a29397bdc036e15d0a225d933c494e2dbea1 Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <kinkade@measurementlab.net>
Date: Wed, 10 Jul 2024 11:25:04 -0600
Subject: [PATCH 3/3] Removes Travis-CI config file

Github Actions on this repo does all the deployments now.
---
 .travis.yml | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index d885985..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-dist: jammy
-language: node_js
-node_js:
-- node
-script:
-- npm install -g firebase-tools
-- bower install
-deploy:
-
-# production
-- provider: firebase
-  token:
-    secure: r1cRKzr4oBC7mUuXamslr9dCWCjyPj4Kyn84wg5jSQhPj3Qg43zGzd98IIxr3rM3chPtpRg4yX579HCXDh4cqUI98qdzrKZqctxiphmOpAIppgJxKWomUIY9/W0V0Ysn3ft9uJA1X5OcJDqH9C4bU+ZHSrohwzW6h8xDTf52HXinuybZD/GzwzEstj41fNWnwyVq1TT47zC/FutkFqY07ZvIp4ocp8OcBMBTGtxepNs6/ekL4W+8tR/LSTByRKEu2/MSuMMUIFtSV2tjZ0G7JkbaV9ig/vBG27gimcrqo/RS3aZ0ylRrKvYT5HlRNAsq1xYpKBk5nj0iji9xcfx3HBtVXM6S4mMB2RnO8I8httok+bfu3a08wAARPrqY+CW7C+2UvYcJM6adYT7/QhIxKTrGl5vzc9bCpRkGnXX45+xEtvXd2L3YctpG80r8FiGtewDmpu/U+Lc5YnGvzRaTQThcUNtmRBVnHKtgiVCOH8cz3hPBkvzmQBNzUhJCKzpcBtogfr+QHshJne3Q4qd74C0J4Gh4VkSTcQjVVpOHpCV/iJt4RnVTs58viyKeEfFChRJs6G3BQDo4cPBrESuBCQLWDZyoWuetkMQFC4LYK2IL1RxGpZ+Hw2J2L3j3RT04zu65b5P/gWr+YLymgsTr4FhQEj8Rd+boMnAxHo9u9D8=
-  project: mlab-oti
-  edge: true
-  only: hosting:speedtest
-  on:
-    repo: m-lab/mlab-speedtest  
-    tags: true
-
-# sandbox
-- provider: firebase
-  token:
-    secure: r1cRKzr4oBC7mUuXamslr9dCWCjyPj4Kyn84wg5jSQhPj3Qg43zGzd98IIxr3rM3chPtpRg4yX579HCXDh4cqUI98qdzrKZqctxiphmOpAIppgJxKWomUIY9/W0V0Ysn3ft9uJA1X5OcJDqH9C4bU+ZHSrohwzW6h8xDTf52HXinuybZD/GzwzEstj41fNWnwyVq1TT47zC/FutkFqY07ZvIp4ocp8OcBMBTGtxepNs6/ekL4W+8tR/LSTByRKEu2/MSuMMUIFtSV2tjZ0G7JkbaV9ig/vBG27gimcrqo/RS3aZ0ylRrKvYT5HlRNAsq1xYpKBk5nj0iji9xcfx3HBtVXM6S4mMB2RnO8I8httok+bfu3a08wAARPrqY+CW7C+2UvYcJM6adYT7/QhIxKTrGl5vzc9bCpRkGnXX45+xEtvXd2L3YctpG80r8FiGtewDmpu/U+Lc5YnGvzRaTQThcUNtmRBVnHKtgiVCOH8cz3hPBkvzmQBNzUhJCKzpcBtogfr+QHshJne3Q4qd74C0J4Gh4VkSTcQjVVpOHpCV/iJt4RnVTs58viyKeEfFChRJs6G3BQDo4cPBrESuBCQLWDZyoWuetkMQFC4LYK2IL1RxGpZ+Hw2J2L3j3RT04zu65b5P/gWr+YLymgsTr4FhQEj8Rd+boMnAxHo9u9D8=
-  project: mlab-sandbox
-  edge: true
-  only: hosting:speedtest
-  on:
-    branch: sandbox-*
-    condition: "$TRAVIS_EVENT_TYPE == push"