Skip to content

Commit 11e5c05

Browse files
committed
fix: conflicts
1 parent dbaeeff commit 11e5c05

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

packages/electron/src/domain/plugin/plugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { generateUUID } from '@datadog/browser-core'
22
import type { RumPlugin, RumPublicApi, StartRumResult } from '@datadog/browser-rum-core'
33
import type { RawRumResourceEvent } from '@datadog/browser-rum-core/src/rawRumEvent.types'
4-
import type { SpanInfo } from '../trace'
4+
import type { SpanInfo } from '../trace/trace'
55

66
let globalPublicApi: RumPublicApi | undefined
77
let globalConfiguration: ElectronPluginConfiguration | undefined

packages/electron/src/domain/renderer/ipcRenderer.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { IpcRenderer } from 'electron'
2-
import { ipcRenderer } from 'electron'
32
import { createSpanIdentifier, createTraceIdentifier } from '@datadog/browser-rum-core/src/domain/tracing/identifier'
43
import { contextBridge, ipcRenderer } from 'electron'
54
import type { Observable } from '@datadog/browser-core'

packages/electron/src/domain/rum/mainProcessTracking.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ export function startMainProcessTracking(
3131
},
3232
}))
3333
console.log('sessionId', mainProcessContext.sessionId)
34+
console.log(
35+
'\x1b[34m%s\x1b[0m',
36+
`https://app.datadoghq.com/rum/sessions?query=%40type%3Asession%20%40session.id%3A${mainProcessContext.sessionId}`
37+
)
3438
const applicationStart = timeStampNow()
3539
let applicationLaunch = {
3640
type: RumEventType.VIEW,

0 commit comments

Comments
 (0)