From da50f90d74b4b401a6964b9bac1219cbfa2ea4be Mon Sep 17 00:00:00 2001 From: Matthew Stuewe Date: Tue, 9 Jul 2024 09:50:14 +0900 Subject: [PATCH 1/2] Add Google Analytics 4 support This based on https://github.com/doorkeeper/event_tracker/pull/19. The PR has been open for over a year, with no perceived movement, so instead we'll update our fork of event_tracker to the latest and include this PR's contents. --- .../integration/google_analytics.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/event_tracker/integration/google_analytics.rb b/lib/event_tracker/integration/google_analytics.rb index 8aa7ab9..fe542e4 100644 --- a/lib/event_tracker/integration/google_analytics.rb +++ b/lib/event_tracker/integration/google_analytics.rb @@ -1,17 +1,19 @@ class EventTracker::Integration::GoogleAnalytics < EventTracker::Integration::Base def init <<-EOD - (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','//www.google-analytics.com/analytics.js','ga'); + (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': + new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], + j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= + 'https://www.googletagmanager.com/gtag/js?id='+i+dl;f.parentNode.insertBefore(j,f); + })(window,document,'script','dataLayer', '#{@key}'); - ga('create', '#{@key}', 'auto', {'name': 'event_tracker'}); - ga('event_tracker.send', 'pageview'); + gtag('js', new Date()); + gtag('config', '#{@key}'); EOD end def track(event_name, properties = {}) - %Q{ga('event_tracker.send', 'event', 'event_tracker', '#{event_name}');} + properties_js = properties.to_json + %Q{gtag('event', '#{event_name}', #{properties_js});} end end From db636277fd018e4d1ab177c448ec2d844af72a48 Mon Sep 17 00:00:00 2001 From: Matthew Stuewe Date: Wed, 14 Aug 2024 15:37:07 +0900 Subject: [PATCH 2/2] Fix gtag not being loaded properly Unfortunately, it appears as if the tentative PR that added Google Analytics 4 neglected to properly load gtag. This commit fixes the problem. --- .../integration/google_analytics.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/event_tracker/integration/google_analytics.rb b/lib/event_tracker/integration/google_analytics.rb index fe542e4..310b18c 100644 --- a/lib/event_tracker/integration/google_analytics.rb +++ b/lib/event_tracker/integration/google_analytics.rb @@ -1,19 +1,20 @@ class EventTracker::Integration::GoogleAnalytics < EventTracker::Integration::Base def init <<-EOD - (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': - new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], - j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= - 'https://www.googletagmanager.com/gtag/js?id='+i+dl;f.parentNode.insertBefore(j,f); - })(window,document,'script','dataLayer', '#{@key}'); - + window.dataLayer = window.dataLayer || []; + function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); gtag('config', '#{@key}'); + + (function(w,d,s,l,i){ + w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'}); + var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:''; + j.async=true;j.src='https://www.googletagmanager.com/gtag/js?id='+i+dl;f.parentNode.insertBefore(j,f); + })(window,document,'script','dataLayer', '#{@key}'); EOD end def track(event_name, properties = {}) - properties_js = properties.to_json - %Q{gtag('event', '#{event_name}', #{properties_js});} + %Q{gtag('event', '#{event_name}', #{properties.to_json});} end end