Skip to content

Commit 1d72c68

Browse files
πŸ”‡ postpone/cleanup cookie and telemetry monitor-until dates (#4840)
1 parent 4d515d6 commit 1d72c68

7 files changed

Lines changed: 23 additions & 204 deletions

File tree

β€Žpackages/browser-core/src/browser/cookieAccess.tsβ€Ž

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,17 @@ export interface CookieAccess {
1818

1919
export type CookieAccessFactory = (cookieName: string, cookieOptions: CookieOptions) => CookieAccess
2020

21+
// Used to identify capability-probe cookies so their write failures aren't reported as telemetry:
22+
// failing to write them is an expected outcome (it triggers the document.cookie fallback), not a bug.
23+
export const TEST_COOKIE_NAME_PREFIX = 'dd_cookie_test_'
24+
2125
export async function areCookiesAuthorized(
2226
createAccess: CookieAccessFactory,
2327
cookieOptions: CookieOptions
2428
): Promise<boolean> {
2529
// Use a unique cookie name to avoid issues when the SDK is initialized multiple times during
2630
// the test cookie lifetime
27-
const testCookieName = `dd_cookie_test_${generateUUID()}`
31+
const testCookieName = `${TEST_COOKIE_NAME_PREFIX}${generateUUID()}`
2832
const testCookieValue = 'test'
2933
const access = createAccess(testCookieName, cookieOptions)
3034
try {
@@ -83,20 +87,22 @@ export function createCookieStoreAccess(cookieName: string, cookieOptions: Cooki
8387
partitioned: cookieOptions.partitioned,
8488
})
8589
} catch (error) {
86-
const documentCookies = getCookies(cookieName)
87-
// monitor-until: 2026-07-01
88-
addTelemetryDebug('Failed to set cookie using Cookie Store API', {
89-
'error.message': (error as Error).message,
90-
newValue: value,
91-
cookieOptions: {
92-
...cookieOptions,
93-
},
94-
cookies: items.map((item) => ({
95-
...item,
96-
})),
97-
cookieCount: items.length,
98-
documentCookies,
99-
})
90+
if (!cookieName.startsWith(TEST_COOKIE_NAME_PREFIX)) {
91+
const documentCookies = getCookies(cookieName)
92+
// monitor-until: 2026-10-01
93+
addTelemetryDebug('Failed to set cookie using Cookie Store API', {
94+
'error.message': (error as Error).message,
95+
newValue: value,
96+
cookieOptions: {
97+
...cookieOptions,
98+
},
99+
cookies: items.map((item) => ({
100+
...item,
101+
})),
102+
cookieCount: items.length,
103+
documentCookies,
104+
})
105+
}
100106
}
101107
},
102108

β€Žpackages/browser-core/src/domain/telemetry/telemetry.tsβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ export const enum TelemetryMetrics {
6666
REMOTE_CONFIGURATION_METRIC_NAME = 'remote configuration metrics',
6767
RECORDER_INIT_METRICS_TELEMETRY_NAME = 'Recorder init metrics',
6868
SEGMENT_METRICS_TELEMETRY_NAME = 'Segment network request metrics',
69-
INITIAL_VIEW_METRICS_TELEMETRY_NAME = 'Initial view metrics',
7069
SESSION_MANAGER_INIT_METRICS_TELEMETRY_NAME = 'Session manager init metrics',
7170
}
7271

β€Žpackages/browser-rum-core/src/boot/startRum.tsβ€Ž

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import type { SdkName } from '../domain/contexts/defaultContext'
5050
import { startDefaultContext } from '../domain/contexts/defaultContext'
5151
import type { Hooks } from '../domain/hooks'
5252
import { startEventCollection } from '../domain/event/eventCollection'
53-
import { startInitialViewMetricsTelemetry } from '../domain/view/viewMetrics/startInitialViewMetricsTelemetry'
5453
import { startSourceCodeContext } from '../domain/contexts/sourceCodeContext'
5554
import type { RecorderApi, ProfilerApi } from './rumPublicApi'
5655

@@ -102,9 +101,6 @@ export function startRum(
102101
cleanupTasks.push(() => pageMayExitSubscription.unsubscribe())
103102
}
104103

105-
const { stop: stopInitialViewMetricsTelemetry } = startInitialViewMetricsTelemetry(lifeCycle, telemetry)
106-
cleanupTasks.push(stopInitialViewMetricsTelemetry)
107-
108104
const { stop: stopRumEventCollection, ...startRumEventCollectionResult } = startRumEventCollection(
109105
lifeCycle,
110106
hooks,

β€Žpackages/browser-rum-core/src/domain/view/viewMetrics/startInitialViewMetricsTelemetry.spec.tsβ€Ž

Lines changed: 0 additions & 112 deletions
This file was deleted.

β€Žpackages/browser-rum-core/src/domain/view/viewMetrics/startInitialViewMetricsTelemetry.tsβ€Ž

Lines changed: 0 additions & 70 deletions
This file was deleted.

β€Žpackages/browser-rum/src/domain/segmentCollection/startSegmentTelemetry.tsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export function startSegmentTelemetry(
4545
(requestEvent.type === 'success' && requestEvent.payload.isFullSnapshot)
4646
) {
4747
const metrics = createSegmentMetrics(requestEvent.type, requestEvent.bandwidth, requestEvent.payload)
48-
// monitor-until: 2026-07-01
48+
// monitor-until: forever
4949
addTelemetryMetrics(TelemetryMetrics.SEGMENT_METRICS_TELEMETRY_NAME, { metrics })
5050
}
5151
})

β€Žpackages/browser-rum/src/domain/startRecorderInitTelemetry.tsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export function startRecorderInitTelemetry(telemetry: Telemetry, observable: Obs
5757
unsubscribe()
5858

5959
if (startContext) {
60-
// monitor-until: 2026-07-01
60+
// monitor-until: forever
6161
addTelemetryMetrics(TelemetryMetrics.RECORDER_INIT_METRICS_TELEMETRY_NAME, {
6262
metrics: createRecorderInitMetrics(
6363
startContext.forced,

0 commit comments

Comments
Β (0)