✅ setup different domain for test app and test intake

DataDog · Feb 26, 2020 · 88edf9d · 88edf9d
1 parent b605acb
commit 88edf9d
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 25 deletions.
diff --git a/test/app/app.ts b/test/app/app.ts
@@ -2,20 +2,21 @@ import { datadogLogs } from '@datadog/browser-logs'
 import { datadogRum } from '@datadog/browser-rum'
 
 // fallback for server side rendering
-const origin = typeof location === 'object' ? location.origin : ''
+const hostname = typeof location === 'object' ? location.hostname : ''
+const intakeOrigin = `http://${hostname}:4000`
 
 datadogLogs.init({
   clientToken: 'key',
   forwardErrorsToLogs: true,
-  internalMonitoringEndpoint: `${origin}/monitoring`,
-  logsEndpoint: `${origin}/logs`,
-  rumEndpoint: `${origin}/rum`,
+  internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
+  logsEndpoint: `${intakeOrigin}/logs`,
+  rumEndpoint: `${intakeOrigin}/rum`,
 })
 
 datadogRum.init({
   applicationId: 'rum',
   clientToken: 'key',
-  internalMonitoringEndpoint: `${origin}/monitoring`,
-  logsEndpoint: `${origin}/logs`,
-  rumEndpoint: `${origin}/rum`,
+  internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
+  logsEndpoint: `${intakeOrigin}/logs`,
+  rumEndpoint: `${intakeOrigin}/rum`,
 })
diff --git a/test/e2e/scenario/helpers.ts b/test/e2e/scenario/helpers.ts
@@ -25,7 +25,7 @@ export interface ServerRumViewEvent extends RumViewEvent {
   }
 }
 
-const baseRequest = request.defaults({ baseUrl: 'http://localhost:3000' })
+const intakeRequest = request.defaults({ baseUrl: 'http://localhost:4000' })
 
 export async function flushEvents() {
   // wait to process event loop before switching page
@@ -97,7 +97,7 @@ export async function resetServerState() {
 
 async function fetch(url: string): Promise<string> {
   return new Promise((resolve, reject) => {
-    baseRequest.get(url, (err: any, response: any, body: string) => {
+    intakeRequest.get(url, (err: any, response: any, body: string) => {
       if (err) {
         reject(err)
       }

diff --git a/test/e2e/wdio.base.conf.js b/test/e2e/wdio.base.conf.js
@@ -1,5 +1,6 @@
 const { exec } = require('child_process')
-let serverProcess
+let appProcess
+let intakeProcess
 
 module.exports = {
   runner: 'local',
@@ -16,7 +17,8 @@ module.exports = {
   },
   e2eMode: process.env.E2E_MODE || 'bundle',
   onPrepare: function() {
-    serverProcess = exec('node test/server/server')
+    appProcess = exec('PORT=3000 node test/server/server')
+    intakeProcess = exec('PORT=4000 node test/server/server')
   },
   before: function() {
     require('ts-node').register({
@@ -25,6 +27,7 @@ module.exports = {
     })
   },
   onComplete: function() {
-    serverProcess.kill()
+    appProcess.kill()
+    intakeProcess.kill()
   },
 }
diff --git a/test/server/server.js b/test/server/server.js
@@ -12,7 +12,7 @@ const rumConfig = require('../../packages/rum/webpack.config')
 const fakeBackend = require('./fake-backend')
 const buildEnv = require('../../scripts/build-env')
 
-let port = 3000
+let port = process.env.PORT || 3000
 
 morgan.token('body', (req, res) => extractBody(req, res))
 const stream = fs.createWriteStream(path.join(__dirname, 'test-server.log'))

diff --git a/test/static/async-e2e-page.html b/test/static/async-e2e-page.html
@@ -10,15 +10,16 @@
     <button>click me</button>
     <script type="text/javascript">
       window.addEventListener('load', () => {
+        const intakeOrigin = `http://${window.location.hostname}:4000`
         const logs = document.createElement('script')
         logs.src = './datadog-logs-us.js'
         logs.onload = () => {
           window.DD_LOGS &&
             window.DD_LOGS.init({
               clientToken: 'key',
-              internalMonitoringEndpoint: `${window.location.origin}/monitoring`,
-              logsEndpoint: `${window.location.origin}/logs`,
-              rumEndpoint: `${window.location.origin}/rum`,
+              internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
+              logsEndpoint: `${intakeOrigin}/logs`,
+              rumEndpoint: `${intakeOrigin}/rum`,
               forwardErrorsToLogs: true,
             })
         }
@@ -31,9 +32,9 @@
             window.DD_RUM.init({
               applicationId: 'rum',
               clientToken: 'key',
-              internalMonitoringEndpoint: `${window.location.origin}/monitoring`,
-              logsEndpoint: `${window.location.origin}/logs`,
-              rumEndpoint: `${window.location.origin}/rum`,
+              internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
+              logsEndpoint: `${intakeOrigin}/logs`,
+              rumEndpoint: `${intakeOrigin}/rum`,
             })
         }
         document.getElementsByTagName('head')[0].appendChild(rum)

diff --git a/test/static/bundle-e2e-page.html b/test/static/bundle-e2e-page.html
@@ -7,12 +7,13 @@
     <title>bundle tests page</title>
     <script type="text/javascript" src="./datadog-logs-us.js"></script>
     <script type="text/javascript">
+      const intakeOrigin = `http://${window.location.hostname}:4000`
       window.DD_LOGS &&
         window.DD_LOGS.init({
           clientToken: 'key',
-          internalMonitoringEndpoint: `${window.location.origin}/monitoring`,
-          logsEndpoint: `${window.location.origin}/logs`,
-          rumEndpoint: `${window.location.origin}/rum`,
+          internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
+          logsEndpoint: `${intakeOrigin}/logs`,
+          rumEndpoint: `${intakeOrigin}/rum`,
           forwardErrorsToLogs: true,
         })
     </script>
@@ -22,9 +23,9 @@
         window.DD_RUM.init({
           applicationId: 'rum',
           clientToken: 'key',
-          internalMonitoringEndpoint: `${window.location.origin}/monitoring`,
-          logsEndpoint: `${window.location.origin}/logs`,
-          rumEndpoint: `${window.location.origin}/rum`,
+          internalMonitoringEndpoint: `${intakeOrigin}/monitoring`,
+          logsEndpoint: `${intakeOrigin}/logs`,
+          rumEndpoint: `${intakeOrigin}/rum`,
         })
     </script>
   </head>