From 194a42c9ca6081c51b5510ce7c4a9d30f78f87c0 Mon Sep 17 00:00:00 2001 From: Meet Patel Date: Thu, 23 Jul 2026 14:20:05 +0530 Subject: [PATCH 1/2] feat: env-driven collector URL for lower envs (BSTACK_ENV) --- bin/testObservability/helper/constants.js | 6 +++++- .../unit/bin/testObservability/collectorUrl.test.js | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 test/unit/bin/testObservability/collectorUrl.test.js diff --git a/bin/testObservability/helper/constants.js b/bin/testObservability/helper/constants.js index d3013f40..25fe654d 100644 --- a/bin/testObservability/helper/constants.js +++ b/bin/testObservability/helper/constants.js @@ -3,7 +3,11 @@ const path = require('path'); exports.consoleHolder = Object.assign({},console); exports.BATCH_SIZE = 1000; exports.BATCH_INTERVAL = 2000; -exports.API_URL = 'https://collector-observability.browserstack.com'; +const _env = process.env.BSTACK_ENV; +const _host = (!_env || _env === 'prod') + ? 'collector-observability.browserstack.com' + : `collector-observability-${_env}.bsstag.com`; +exports.API_URL = `https://${_host}`; exports.IPC_EVENTS = { LOG: 'testObservability:cypressLog', diff --git a/test/unit/bin/testObservability/collectorUrl.test.js b/test/unit/bin/testObservability/collectorUrl.test.js new file mode 100644 index 00000000..45e2adc2 --- /dev/null +++ b/test/unit/bin/testObservability/collectorUrl.test.js @@ -0,0 +1,13 @@ +const { expect } = require('chai'); +describe('o11y collector URL', () => { + afterEach(() => { delete process.env.BSTACK_ENV; delete require.cache[require.resolve('../../../../bin/testObservability/helper/constants')]; }); + it('defaults to prod', () => { + const c = require('../../../../bin/testObservability/helper/constants'); + expect(c.API_URL).to.equal('https://collector-observability.browserstack.com'); + }); + it('expands for lower env', () => { + process.env.BSTACK_ENV = 'k8s'; + const c = require('../../../../bin/testObservability/helper/constants'); + expect(c.API_URL).to.equal('https://collector-observability-k8s.bsstag.com'); + }); +}); From c7f63d96aaf016240bccabfbe897172b0155115b Mon Sep 17 00:00:00 2001 From: Meet Patel Date: Thu, 23 Jul 2026 17:54:01 +0530 Subject: [PATCH 2/2] [A11Y-12376] Fix cypress lower-env collector host to collector-testhub --- bin/testObservability/helper/constants.js | 4 +++- test/unit/bin/testObservability/collectorUrl.test.js | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/testObservability/helper/constants.js b/bin/testObservability/helper/constants.js index 25fe654d..a56a9fe7 100644 --- a/bin/testObservability/helper/constants.js +++ b/bin/testObservability/helper/constants.js @@ -3,10 +3,12 @@ const path = require('path'); exports.consoleHolder = Object.assign({},console); exports.BATCH_SIZE = 1000; exports.BATCH_INTERVAL = 2000; +// Lower-env collector is collector-testhub- (per a11y/sdk/scripts/setupOnDemandSDKRepo.sh), +// NOT collector-observability- (that host does not exist). const _env = process.env.BSTACK_ENV; const _host = (!_env || _env === 'prod') ? 'collector-observability.browserstack.com' - : `collector-observability-${_env}.bsstag.com`; + : `collector-testhub-${_env}.bsstag.com`; exports.API_URL = `https://${_host}`; exports.IPC_EVENTS = { diff --git a/test/unit/bin/testObservability/collectorUrl.test.js b/test/unit/bin/testObservability/collectorUrl.test.js index 45e2adc2..36fce8f7 100644 --- a/test/unit/bin/testObservability/collectorUrl.test.js +++ b/test/unit/bin/testObservability/collectorUrl.test.js @@ -5,9 +5,9 @@ describe('o11y collector URL', () => { const c = require('../../../../bin/testObservability/helper/constants'); expect(c.API_URL).to.equal('https://collector-observability.browserstack.com'); }); - it('expands for lower env', () => { + it('expands for lower env to collector-testhub', () => { process.env.BSTACK_ENV = 'k8s'; const c = require('../../../../bin/testObservability/helper/constants'); - expect(c.API_URL).to.equal('https://collector-observability-k8s.bsstag.com'); + expect(c.API_URL).to.equal('https://collector-testhub-k8s.bsstag.com'); }); });