Merge branch 'enable-tracing-for-dd-rum' into staging

CruGlobal · Nov 14, 2023 · 1171bff · 1171bff
2 parents b3dc178 + 3b5f1f8
commit 1171bff
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/src/common/app.config.js b/src/common/app.config.js
@@ -5,7 +5,8 @@ import 'angular-translate'
 import rollbarConfig from './rollbar.config'
 import dataDogConfig from './datadog.config.js'
 
-const appConfig = /* @ngInject */ function (envServiceProvider, $compileProvider, $logProvider, $httpProvider, $locationProvider, $qProvider, $translateProvider) {
+// Exported for datadog.config tests.
+export const appConfig = /* @ngInject */ function (envServiceProvider, $compileProvider, $logProvider, $httpProvider, $locationProvider, $qProvider, $translateProvider) {
   $httpProvider.useApplyAsync(true)
 
   envServiceProvider.config({

diff --git a/src/common/datadog-shouldNotLoad.config.spec.js b/src/common/datadog-shouldNotLoad.config.spec.js
@@ -1,16 +1,20 @@
 import angular from 'angular'
 import 'angular-mocks'
+import { appConfig } from './app.config'
 import * as module from './datadog.config'
 
 describe('dataDogConfig', () => {
 
   describe('pipe $log to Rollbar', () => {
     beforeEach(() => {
-      // Use rollbar config function somewhere
-      angular.module('testDataDogConfig', ['environment'])
+      // Added appConfig as needed the envServiceProvider vars
+      angular.module('testAppAndDataDogConfig', [
+        'environment',
+        'pascalprecht.translate'
+      ])
+        .config(appConfig)
         .config(module.default)
-      // Init and run the test module
-      angular.mock.module('testDataDogConfig')
+      angular.mock.module('testAppAndDataDogConfig')
       inject(() => {})
     })
 

diff --git a/src/common/datadog.config.js b/src/common/datadog.config.js
@@ -10,6 +10,7 @@ const dataDogConfig = /* @ngInject */ function (envServiceProvider) {
       site: 'datadoghq.com',
       service: 'give-web',
       env: envServiceProvider.get(),
+      allowedTracingUrls: [envServiceProvider.read('apiUrl')],
       version: process.env.GITHUB_SHA,
       sessionSampleRate: envServiceProvider.is('staging') ? 100 : 10,
       sessionReplaySampleRate: envServiceProvider.is('staging') ? 100 : 1,

diff --git a/src/common/datadog.config.spec.js b/src/common/datadog.config.spec.js
@@ -1,20 +1,24 @@
 import angular from 'angular'
 import 'angular-mocks'
 import * as module from './datadog.config'
+import { appConfig } from './app.config'
 
 describe('dataDogConfig', () => {
   process.env.DATADOG_RUM_CLIENT_TOKEN = '1234'
-  describe('pipe $log to Rollbar', () => {
+  describe('configure Datadog RUM', () => {
     beforeEach(() => {
-      // Use rollbar config function somewhere
-      angular.module('testDataDogConfig', ['environment'])
+      // Added appConfig as needed the envServiceProvider vars
+      angular.module('testAppAndDataDogConfig', [
+        'environment',
+        'pascalprecht.translate'
+      ])
+        .config(appConfig)
         .config(module.default)
-        // Init and run the test module
-        angular.mock.module('testDataDogConfig')
-        inject(() => {})
+      angular.mock.module('testAppAndDataDogConfig')
+      inject(() => {})
     })
-
-    it('should send $log.log to rollbar and call through to $log', () => {
+        
+    it('should call init() and start session reply recording', () => {
       expect(window.datadogRum).not.toEqual(undefined)
       expect(window.datadogRum.init).toEqual(expect.any(Function))
       expect(window.datadogRum.startSessionReplayRecording).toEqual(expect.any(Function))