Set service and version in startViews

packages/rum-core/src/domain/assembly.spec.ts

@@ -535,18 +535,6 @@ describe('rum assembly', () => {
   describe('service and version', () => {
     const extraConfigurationOptions = { service: 'default service', version: 'default version' }
 
-    it('should come from the init configuration by default', () => {
-      const { lifeCycle, serverRumEvents } = setupAssemblyTestWithDefaults({
-        partialConfiguration: extraConfigurationOptions,
-      })
-
-      notifyRawRumEvent(lifeCycle, {
-        rawRumEvent: createRawRumEvent(RumEventType.ACTION),
-      })
-      expect(serverRumEvents[0].service).toEqual('default service')
-      expect(serverRumEvents[0].version).toEqual('default version')
-    })
-
     describe('fields service and version', () => {
       it('it should be modifiable', () => {
         const { lifeCycle, serverRumEvents } = setupAssemblyTestWithDefaults({

packages/rum-core/src/domain/assembly.ts

@@ -155,8 +155,6 @@ export function startRumAssembly(
             id: configuration.applicationId,
           },
           date: timeStampNow(),
-          service: configuration.service,
-          version: configuration.version,
           source: 'browser',
           session: {
             id: session.id,

packages/rum-core/src/domain/view/setupViewTest.specHelper.ts

@@ -2,6 +2,7 @@ import { Observable, deepClone } from '@datadog/browser-core'
 import { mockRumConfiguration, setupLocationObserver } from '../../../test'
 import type { LifeCycle } from '../lifeCycle'
 import { LifeCycleEventType } from '../lifeCycle'
+import type { RumConfiguration } from '../configuration'
 import type { ViewCreatedEvent, ViewEvent, ViewOptions, ViewEndedEvent } from './trackViews'
 import { trackViews } from './trackViews'
 
@@ -10,12 +11,16 @@ export type ViewTest = ReturnType<typeof setupViewTest>
 interface ViewTrackingContext {
   lifeCycle: LifeCycle
   initialLocation?: string
+  partialConfig?: Partial<RumConfiguration>
 }
 
-export function setupViewTest({ lifeCycle, initialLocation }: ViewTrackingContext, initialViewOptions?: ViewOptions) {
+export function setupViewTest(
+  { lifeCycle, initialLocation, partialConfig }: ViewTrackingContext,
+  initialViewOptions?: ViewOptions
+) {
   const domMutationObservable = new Observable<void>()
   const windowOpenObservable = new Observable<void>()
-  const configuration = mockRumConfiguration()
+  const configuration = mockRumConfiguration(partialConfig)
   const { locationChangeObservable, changeLocation } = setupLocationObserver(initialLocation)
 
   const {

packages/rum-core/src/domain/view/trackViews.spec.ts

@@ -966,3 +966,43 @@ describe('view event count', () => {
     })
   })
 })
+
+describe('service and version', () => {
+  const lifeCycle = new LifeCycle()
+  let clock: Clock
+  let viewTest: ViewTest
+
+  beforeEach(() => {
+    clock = mockClock()
+
+    registerCleanupTask(() => {
+      viewTest.stop()
+      clock.cleanup()
+      resetExperimentalFeatures()
+    })
+  })
+
+  it('should come from the init configuration by default', () => {
+    viewTest = setupViewTest({ lifeCycle, partialConfig: { service: 'service', version: 'version' } })
+
+    const { getViewUpdate } = viewTest
+
+    expect(getViewUpdate(0).service).toEqual('service')
+    expect(getViewUpdate(0).version).toEqual('version')
+  })
+
+  it('should come from the view option if defined', () => {
+    viewTest = setupViewTest(
+      { lifeCycle, partialConfig: { service: 'service', version: 'version' } },
+      {
+        service: 'view service',
+        version: 'view version',
+      }
+    )
+
+    const { getViewUpdate } = viewTest
+
+    expect(getViewUpdate(0).service).toEqual('view service')
+    expect(getViewUpdate(0).version).toEqual('view version')
+  })
+})

packages/rum-core/src/domain/view/trackViews.ts

@@ -209,14 +209,19 @@ function newView(
 
   let sessionIsActive = true
   let name: string | undefined
-  let service: string | undefined
-  let version: string | undefined
+  let service = configuration.service
+  let version = configuration.version
   let context: Context | undefined
 
   if (viewOptions) {
     name = viewOptions.name
-    service = viewOptions.service || undefined
-    version = viewOptions.version || undefined
+    if (viewOptions.service) {
+      service = viewOptions.service
+    }
+    if (viewOptions.version) {
+      version = viewOptions.version
+    }
+
     if (viewOptions.context) {
       context = viewOptions.context
       // use ContextManager to update the context so we always sanitize it