Merge pull request #36010 from chalin/chalin-im-use-ga4-id-2022-08-16

Google analytics: use GA4 site tag

Author: k8s-ci-robot

config.toml

@@ -117,7 +117,7 @@ anchor = "smart"
 
 [services]
 [services.googleAnalytics]
-# Comment out the next line to disable GA tracking. Also disables the feature described in [params.ui.feedback].
+# Fake ID in support of [params.ui.feedback]. The real GA ID is set in the Netlify config.
 id = "UA-00000000-0"
 
 [params]

layouts/partials/head.html

@@ -6,17 +6,6 @@
 {{- else -}}
 <meta name="ROBOTS" content="NOINDEX, NOFOLLOW">
 {{- end -}}
-{{- if in (slice "production" "nonprod") hugo.Environment -}}
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-36037335-10"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'UA-36037335-10');
-</script>
-{{- end -}}
 
 <!-- alternative translations -->
 {{ range .Translations -}}
@@ -36,7 +25,7 @@
 {{- template "_internal/schema.html" . -}}
 {{- template "_internal/twitter_cards.html" . -}}
 {{- if hugo.IsProduction -}}
-{{ template "_internal/google_analytics_async.html" . }}
+{{ template "_internal/google_analytics.html" . }}
 {{ end }}
 {{ partialCached "head-css.html" . "asdf" }}
 <script