Upgrade to GA4 (#3403)

* GA4

* UA + GA4 + CSP updates

---------

Co-authored-by: Barry Pollard <barrypollard@google.com>

Author: rviscomi

src/server/csp.py

@@ -13,6 +13,7 @@
         "'self'",
         "webmention.io",
         "discuss.httparchive.org",
+        "*.google-analytics.com",
         "www.google-analytics.com",
         "www.googletagmanager.com",
     ],

src/server/search_csp.py

@@ -14,7 +14,7 @@
     "connect-src": ["'self'", "www.google-analytics.com", "www.googletagmanager.com"],
     "img-src": [
         "'self'",
-        "www.google-analytics.com",
+        "*.google-analytics.com",
         "www.googletagmanager.com",
         "www.googleapis.com",
         "*.google.com",

src/server/stories_csp.py

@@ -11,7 +11,7 @@
     "connect-src": [
         "'self'",
         "discuss.httparchive.org",
-        "www.google-analytics.com",
+        "*.google-analytics.com",
         "www.googletagmanager.com",
         "cdn.ampproject.org",
     ],

src/templates/base.html

@@ -22,6 +22,7 @@
         gtag('config', 'UA-22381566-3', {
           'link_attribution': true
         });
+        gtag('config', 'G-PQ5N2MZG5M');
       </script>
     {% endblock %}
     <link rel="shortcut icon" href="/static/images/favicon.ico">
@@ -99,7 +100,7 @@
     {% block content %}{% endblock %}
 
     {% block bodyend %}
-    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-22381566-3" nonce="{{ csp_nonce() }}"></script>
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-PQ5N2MZG5M" nonce="{{ csp_nonce() }}"></script>
     <link rel="preconnect" href="https://www.google-analytics.com">
     <script defer src="{{ get_versioned_filename('/static/js/web-vitals.js') }}" nonce="{{ csp_nonce() }}"></script>
     <script defer src="{{ get_versioned_filename('/static/js/send-web-vitals.js') }}" nonce="{{ csp_nonce() }}"></script>