Fix for priority of contexts and add tracker

DataDog · Aug 28, 2024 · 9534087 · 9534087
1 parent eee15cf
commit 9534087
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/packages/core/src/domain/context/contextConstants.ts b/packages/core/src/domain/context/contextConstants.ts
@@ -2,4 +2,5 @@ export const enum CustomerDataType {
   FeatureFlag,
   User,
   GlobalContext,
+  View,
 }
diff --git a/packages/rum-core/src/boot/rumPublicApi.ts b/packages/rum-core/src/boot/rumPublicApi.ts
@@ -426,6 +426,9 @@ export function makeRumPublicApi(
     (options: ViewOptions): void
   } = monitor((options?: string | ViewOptions) => {
     const sanitizedOptions = typeof options === 'object' ? options : { name: options }
+    if (sanitizedOptions.context) {
+      customerDataTrackerManager.getOrCreateTracker(CustomerDataType.View).updateCustomerData(sanitizedOptions.context)
+    }
     strategy.startView(sanitizedOptions)
     addTelemetryUsage({ feature: 'start-view' })
   })

diff --git a/packages/rum-core/src/domain/assembly.ts b/packages/rum-core/src/domain/assembly.ts
@@ -184,11 +184,7 @@ export function startRumAssembly(
         }
 
         const serverRumEvent = combine(rumContext as RumContext & Context, rawRumEvent) as RumEvent & Context
-        serverRumEvent.context = combine(
-          commonContext.context,
-          customerContext,
-          serverRumEvent.type !== 'view' ? viewContext.customerContext : undefined
-        )
+        serverRumEvent.context = combine(commonContext.context, viewContext.customerContext, customerContext)
 
         if (!('has_replay' in serverRumEvent.session)) {
           ;(serverRumEvent.session as Mutable<RumEvent['session']>).has_replay = commonContext.hasReplay

diff --git a/packages/rum-core/src/domain/view/viewCollection.ts b/packages/rum-core/src/domain/view/viewCollection.ts
@@ -128,7 +128,6 @@ function processViewUpdate(
   }
 
   return {
-    customerContext: view.context,
     rawRumEvent: viewEvent,
     startTime: view.startClocks.relative,
     domainContext: {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ export const enum CustomerDataType { @@
       FeatureFlag,
       User,
       GlobalContext,
+      View,
     }