From 410e0ff4fd65eef819fc0ea03214c584eb1f0a1e Mon Sep 17 00:00:00 2001
From: Daniel Archer <me@dja.io>
Date: Wed, 19 Mar 2025 14:05:21 -0700
Subject: [PATCH 1/2] Add support to GTM and GA4 for customizing the domain to
 allow for a first-party domain

---
 integrations/google-analytics-4/HISTORY.md    |  5 ++
 integrations/google-analytics-4/lib/index.js  |  3 +-
 integrations/google-analytics-4/package.json  |  4 +-
 .../google-analytics-4/test/index.test.js     | 53 +++++++++++++++++++
 integrations/google-tag-manager/HISTORY.md    |  5 ++
 integrations/google-tag-manager/lib/index.js  |  5 +-
 integrations/google-tag-manager/package.json  |  4 +-
 .../google-tag-manager/test/index.test.js     | 17 ++++++
 8 files changed, 89 insertions(+), 7 deletions(-)
 create mode 100644 integrations/google-analytics-4/test/index.test.js

diff --git a/integrations/google-analytics-4/HISTORY.md b/integrations/google-analytics-4/HISTORY.md
index 8b0fa67d0..7d78e6f8c 100644
--- a/integrations/google-analytics-4/HISTORY.md
+++ b/integrations/google-analytics-4/HISTORY.md
@@ -1,3 +1,8 @@
+0.1.0 / 2025-03-19
+==================
+
+  * Add support for custom domain configuration for gtag.js script loading
+
 0.0.2 / 2021-03-24
 ==================
 
diff --git a/integrations/google-analytics-4/lib/index.js b/integrations/google-analytics-4/lib/index.js
index b5daacfe0..a1cf533a2 100644
--- a/integrations/google-analytics-4/lib/index.js
+++ b/integrations/google-analytics-4/lib/index.js
@@ -13,6 +13,7 @@ var GA4 = (module.exports = integration('Google Analytics 4')
   .global('gtag')
   .global('ga4DataLayer')
   .option('measurementIds', [])
+  .option('domain', 'www.googletagmanager.com')
   .option('cookieDomainName', 'auto')
   .option('cookiePrefix', '_ga')
   .option('cookieExpiration', 63072000)
@@ -48,7 +49,7 @@ var GA4 = (module.exports = integration('Google Analytics 4')
    */
   .option('customEventsAndParameters', [])
   .tag(
-    '<script src="//www.googletagmanager.com/gtag/js?id={{ measurementId }}&l=ga4DataLayer">'
+    '<script src="//{{{ domain }}}/gtag/js?id={{ measurementId }}&l=ga4DataLayer">'
   ));
 
 /**
diff --git a/integrations/google-analytics-4/package.json b/integrations/google-analytics-4/package.json
index 89a4386cf..fbb99e73f 100644
--- a/integrations/google-analytics-4/package.json
+++ b/integrations/google-analytics-4/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@segment/analytics.js-integration-google-analytics-4",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "description": "",
   "main": "lib/index.js",
   "directories": {
@@ -52,4 +52,4 @@
     "to-array": "^0.1.4",
     "watchify": "^3.7.0"
   }
-}
+}
\ No newline at end of file
diff --git a/integrations/google-analytics-4/test/index.test.js b/integrations/google-analytics-4/test/index.test.js
new file mode 100644
index 000000000..6d3d9ef98
--- /dev/null
+++ b/integrations/google-analytics-4/test/index.test.js
@@ -0,0 +1,53 @@
+'use strict';
+
+var Analytics = require('@segment/analytics.js-core').constructor;
+var integration = require('@segment/analytics.js-integration');
+var sandbox = require('@segment/clear-env');
+var tester = require('@segment/analytics.js-integration-tester');
+var GA4 = require('../lib/');
+
+describe('Google Analytics 4', function() {
+  var analytics;
+  var ga4;
+  var options = {
+    containerId: 'GTM-XXXX',
+    environment: '',
+    domain: 'www.googletagmanager.com',
+    trackNamedPages: true,
+    trackCategorizedPages: true
+  };
+
+  beforeEach(function() {
+    analytics = new Analytics();
+    ga4 = new GA4(options);
+    analytics.use(GA4);
+    analytics.use(tester);
+    analytics.add(ga4);
+  });
+
+  afterEach(function() {
+    analytics.restore();
+    analytics.reset();
+    ga4.reset();
+    sandbox();
+  });
+
+  describe('loading', function() {
+    it('should load default domain', function() {
+      analytics.spy(ga4, 'load');
+      analytics.initialize();
+      analytics.page();
+      analytics.called(ga4.load);
+      analytics.assert(ga4.options.domain === 'www.googletagmanager.com');
+    });
+
+    it('should load custom domain if specified', function() {
+      ga4.options.domain = 'custom.example.com';
+      analytics.spy(ga4, 'load');
+      analytics.initialize();
+      analytics.page();
+      analytics.called(ga4.load);
+      analytics.assert(ga4.options.domain === 'custom.example.com');
+    });
+  });
+});
\ No newline at end of file
diff --git a/integrations/google-tag-manager/HISTORY.md b/integrations/google-tag-manager/HISTORY.md
index 988eb286a..d6be67a94 100644
--- a/integrations/google-tag-manager/HISTORY.md
+++ b/integrations/google-tag-manager/HISTORY.md
@@ -1,3 +1,8 @@
+2.6.0 / 2025-03-19
+==================
+
+  * Add support for custom domain configuration for GTM script loading
+
 2.5.0 / 2017-04-27
 ==================
 
diff --git a/integrations/google-tag-manager/lib/index.js b/integrations/google-tag-manager/lib/index.js
index f3e757369..07903d2ec 100644
--- a/integrations/google-tag-manager/lib/index.js
+++ b/integrations/google-tag-manager/lib/index.js
@@ -16,15 +16,16 @@ var GTM = (module.exports = integration('Google Tag Manager')
   .global('google_tag_manager')
   .option('containerId', '')
   .option('environment', '')
+  .option('domain', 'www.googletagmanager.com')
   .option('trackNamedPages', true)
   .option('trackCategorizedPages', true)
   .tag(
     'no-env',
-    '<script src="//www.googletagmanager.com/gtm.js?id={{ containerId }}&l=dataLayer">'
+    '<script src="//{{{ domain }}}/gtm.js?id={{ containerId }}&l=dataLayer">'
   )
   .tag(
     'with-env',
-    '<script src="//www.googletagmanager.com/gtm.js?id={{ containerId }}&l=dataLayer&gtm_preview={{ environment }}">'
+    '<script src="//{{{ domain }}}/gtm.js?id={{ containerId }}&l=dataLayer&gtm_preview={{ environment }}">'
   ));
 
 /**
diff --git a/integrations/google-tag-manager/package.json b/integrations/google-tag-manager/package.json
index 6b3a97c17..f7b5b6a4d 100644
--- a/integrations/google-tag-manager/package.json
+++ b/integrations/google-tag-manager/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@segment/analytics.js-integration-google-tag-manager",
   "description": "The Google Tag Manager analytics.js integration.",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "keywords": [
     "analytics.js",
     "analytics.js-integration",
@@ -44,4 +44,4 @@
     "mocha": "^6.1.4",
     "watchify": "^3.11.1"
   }
-}
+}
\ No newline at end of file
diff --git a/integrations/google-tag-manager/test/index.test.js b/integrations/google-tag-manager/test/index.test.js
index 82a7960b9..54457c4e1 100644
--- a/integrations/google-tag-manager/test/index.test.js
+++ b/integrations/google-tag-manager/test/index.test.js
@@ -45,6 +45,23 @@ describe('Google Tag Manager', function() {
     it('should load', function(done) {
       analytics.load(gtm, done);
     });
+
+    it('should load default domain', function() {
+      analytics.spy(gtm, 'load');
+      analytics.initialize();
+      analytics.page();
+      analytics.called(gtm.load);
+      analytics.assert(gtm.options.domain === 'www.googletagmanager.com');
+    });
+
+    it('should load custom domain if specified', function() {
+      gtm.options.domain = 'custom.example.com';
+      analytics.spy(gtm, 'load');
+      analytics.initialize();
+      analytics.page();
+      analytics.called(gtm.load);
+      analytics.assert(gtm.options.domain === 'custom.example.com');
+    });
   });
 
   describe('after loading', function() {

From 1f5ef5f7be87e5dd497e032deef3f48623334b6d Mon Sep 17 00:00:00 2001
From: Daniel Archer <me@dja.io>
Date: Wed, 19 Mar 2025 14:19:41 -0700
Subject: [PATCH 2/2] Add `server_container_url` to config for GA4, update
 tests

---
 integrations/google-analytics-4/lib/index.js  |  6 ++++++
 integrations/google-analytics-4/test/index.js | 15 +++++++++++++++
 .../google-analytics-4/test/index.test.js     | 19 -------------------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/integrations/google-analytics-4/lib/index.js b/integrations/google-analytics-4/lib/index.js
index a1cf533a2..d8d0c0a32 100644
--- a/integrations/google-analytics-4/lib/index.js
+++ b/integrations/google-analytics-4/lib/index.js
@@ -91,6 +91,12 @@ GA4.prototype.initialize = function() {
      */
     send_page_view: opts.sendAutomaticPageViewEvent,
 
+    /**
+     * Server Container URL
+     * https://developers.google.com/tag-platform/tag-manager/server-side/dependency-serving
+     */
+    server_container_url: '//' + opts.domain,
+
     /**
      * Cookie Update
      * https://developers.google.com/analytics/devguides/collection/ga4/cookies-user-id#cookie_update_parameter
diff --git a/integrations/google-analytics-4/test/index.js b/integrations/google-analytics-4/test/index.js
index 3dfe3de80..9848294af 100644
--- a/integrations/google-analytics-4/test/index.js
+++ b/integrations/google-analytics-4/test/index.js
@@ -40,6 +40,7 @@ describe('Google Analytics 4', function () {
                 .global('gtag')
                 .global('ga4DataLayer')
                 .option('measurementIds', [])
+                .option('domain', 'www.googletagmanager.com')
                 .option('cookieDomainName', 'auto')
                 .option('cookiePrefix', '_ga')
                 .option('cookieExpiration', 63072000)
@@ -96,6 +97,13 @@ describe('Google Analytics 4', function () {
                 analytics.called(ga4.load)
                 analytics.loaded('<script src="http://www.googletagmanager.com/gtag/js?id=G-100&l=ga4DataLayer"></script>')
             });
+
+            it('should load gtag.js with the custom domain', function () {
+                ga4.options.domain = 'custom.example.com';
+                analytics.initialize();
+                analytics.called(ga4.load)
+                analytics.loaded('<script src="http://custom.example.com/gtag/js?id=G-100&l=ga4DataLayer"></script>')
+            });
         });
     });
 
@@ -124,6 +132,13 @@ describe('Google Analytics 4', function () {
             analytics.equal(window.ga4DataLayer[2][2]['send_page_view'], false)
         });
 
+        it('should set the server_container_url for all measurement IDs', function () {
+            ga4.options.domain = 'https://custom.example.com';
+            analytics.initialize();
+            analytics.equal(window.ga4DataLayer[1][2]['server_container_url'], 'https://custom.example.com')
+            analytics.equal(window.ga4DataLayer[2][2]['server_container_url'], 'https://custom.example.com')
+        });
+
         it('should set cookie related setting for all measurement IDs', function () {
             ga4.options.cookieUpdate = false;
             ga4.options.cookieDomainName = 'ajs.test'
diff --git a/integrations/google-analytics-4/test/index.test.js b/integrations/google-analytics-4/test/index.test.js
index 6d3d9ef98..f5f02e0d6 100644
--- a/integrations/google-analytics-4/test/index.test.js
+++ b/integrations/google-analytics-4/test/index.test.js
@@ -31,23 +31,4 @@ describe('Google Analytics 4', function() {
     ga4.reset();
     sandbox();
   });
-
-  describe('loading', function() {
-    it('should load default domain', function() {
-      analytics.spy(ga4, 'load');
-      analytics.initialize();
-      analytics.page();
-      analytics.called(ga4.load);
-      analytics.assert(ga4.options.domain === 'www.googletagmanager.com');
-    });
-
-    it('should load custom domain if specified', function() {
-      ga4.options.domain = 'custom.example.com';
-      analytics.spy(ga4, 'load');
-      analytics.initialize();
-      analytics.page();
-      analytics.called(ga4.load);
-      analytics.assert(ga4.options.domain === 'custom.example.com');
-    });
-  });
 });
\ No newline at end of file