♻️ generalise document-policy-violation support to all featureIds

Replace the NEG-specific `networkEfficiencyGuardrails` RawReportType with a
generic `documentPolicyViolation: 'document-policy-violation'` entry that
mirrors how `intervention` and `deprecation` are modelled.

- Remove the `buildReportObserverTypes()` mapping layer (it existed solely to
  translate 'network-efficiency-guardrails' → 'document-policy-violation')
- Remove the featureId filter in the ReportingObserver callback that was
  silently dropping non-NEG document-policy-violation reports
- RUM now collects all document-policy-violation reports automatically;
  Logs users opt in with `forwardReports: ['document-policy-violation']`
- Future document policy features (e.g. js-profiling-mode, sync-xhr) are
  automatically captured without any SDK change

Author: thomasbertet

packages/browser-core/src/domain/report/reportObservable.spec.ts

@@ -80,8 +80,8 @@ describe('report observable', () => {
     expect(notifyReport).not.toHaveBeenCalled()
   })
 
-  it(`should notify ${RawReportType.networkEfficiencyGuardrails} reports`, () => {
-    consoleSubscription = initReportObservable([RawReportType.networkEfficiencyGuardrails]).subscribe(notifyReport)
+  it(`should notify ${RawReportType.documentPolicyViolation} reports`, () => {
+    consoleSubscription = initReportObservable([RawReportType.documentPolicyViolation]).subscribe(notifyReport)
     reportingObserver.raiseReport('document-policy-violation')
 
     expect(notifyReport).toHaveBeenCalledOnceWith(
@@ -93,8 +93,8 @@ describe('report observable', () => {
     )
   })
 
-  it(`should compute stack for ${RawReportType.networkEfficiencyGuardrails}`, () => {
-    consoleSubscription = initReportObservable([RawReportType.networkEfficiencyGuardrails]).subscribe(notifyReport)
+  it(`should compute stack for ${RawReportType.documentPolicyViolation}`, () => {
+    consoleSubscription = initReportObservable([RawReportType.documentPolicyViolation]).subscribe(notifyReport)
     reportingObserver.raiseReport('document-policy-violation')
 
     const [report] = notifyReport.calls.mostRecent().args
@@ -104,12 +104,16 @@ describe('report observable', () => {
   at <anonymous> @ https://foo.bar/large-uncompressed.js`)
   })
 
-  it(`should not notify document-policy-violation reports with a featureId other than ${RawReportType.networkEfficiencyGuardrails}`, () => {
-    consoleSubscription = initReportObservable([RawReportType.networkEfficiencyGuardrails]).subscribe(notifyReport)
+  it(`should notify ${RawReportType.documentPolicyViolation} reports regardless of featureId`, () => {
+    consoleSubscription = initReportObservable([RawReportType.documentPolicyViolation]).subscribe(notifyReport)
     reportingObserver.raiseReport('document-policy-violation', {
       body: { ...FAKE_DOCUMENT_POLICY_VIOLATION_REPORT.body, featureId: 'some-other-policy' },
     })
 
-    expect(notifyReport).not.toHaveBeenCalled()
+    expect(notifyReport).toHaveBeenCalledOnceWith(
+      jasmine.objectContaining({
+        type: 'some-other-policy',
+      })
+    )
   })
 })

packages/browser-core/src/domain/report/reportObservable.ts

@@ -12,7 +12,7 @@ export const RawReportType = {
   intervention: 'intervention',
   deprecation: 'deprecation',
   cspViolation: 'csp_violation',
-  networkEfficiencyGuardrails: 'network-efficiency-guardrails',
+  documentPolicyViolation: 'document-policy-violation',
 } as const
 
 export type RawReportType = (typeof RawReportType)[keyof typeof RawReportType]
@@ -28,34 +28,14 @@ export function initReportObservable(apis: RawReportType[]) {
     observables.push(createCspViolationReportObservable())
   }
 
-  const reportTypes = buildReportObserverTypes(apis)
+  const reportTypes = apis.filter((api): api is ReportType => api !== RawReportType.cspViolation)
   if (reportTypes.length) {
     observables.push(createReportObservable(reportTypes))
   }
 
   return mergeObservables(...observables)
 }
 
-/**
- * Maps internal RawReportType values to the browser ReportingObserver type strings.
- * `network-efficiency-guardrails` is exposed via `document-policy-violation` reports,
- * filtered by `body.featureId === 'network-efficiency-guardrails'`.
- */
-function buildReportObserverTypes(apis: RawReportType[]): ReportType[] {
-  const types = new Set<ReportType>()
-  for (const api of apis) {
-    if (api === RawReportType.cspViolation) {
-      continue
-    }
-    if (api === RawReportType.networkEfficiencyGuardrails) {
-      types.add('document-policy-violation')
-    } else {
-      types.add(api)
-    }
-  }
-  return Array.from(types)
-}
-
 function createReportObservable(reportTypes: ReportType[]) {
   return new Observable<RawReportError>((observable) => {
     if (!window.ReportingObserver) {
@@ -64,18 +44,7 @@ function createReportObservable(reportTypes: ReportType[]) {
 
     const handleReports = monitor(
       (reports: Array<DeprecationReport | InterventionReport | DocumentPolicyViolationReport>, _: ReportingObserver) =>
-        reports.forEach((report) => {
-          // document-policy-violation reports are only subscribed to when
-          // network-efficiency-guardrails is requested. Skip any document policy violation
-          // whose featureId does not match network-efficiency-guardrails.
-          if (
-            report.type === 'document-policy-violation' &&
-            report.body.featureId !== RawReportType.networkEfficiencyGuardrails
-          ) {
-            return
-          }
-          observable.notify(buildRawReportErrorFromReport(report))
-        })
+        reports.forEach((report) => observable.notify(buildRawReportErrorFromReport(report)))
     ) as ReportingObserverCallback
 
     const observer = new window.ReportingObserver(handleReports, {

packages/browser-rum-core/src/domain/error/trackReportError.ts

@@ -4,7 +4,7 @@ export function trackReportError(errorObservable: Observable<RawError>) {
   const subscription = initReportObservable([
     RawReportType.cspViolation,
     RawReportType.intervention,
-    RawReportType.networkEfficiencyGuardrails,
+    RawReportType.documentPolicyViolation,
   ]).subscribe((rawError) => errorObservable.notify(rawError))
 
   return {

test/e2e/scenario/networkEfficiencyGuardrails.scenario.ts

@@ -54,7 +54,7 @@ test.describe('network efficiency guardrails', () => {
 
   test.describe('Logs', () => {
     createTest('should forward network-efficiency-guardrails violations via forwardReports')
-      .withLogs({ forwardReports: ['network-efficiency-guardrails'] })
+      .withLogs({ forwardReports: ['document-policy-violation'] })
       .withBasePath('/?network-efficiency-guardrails=true')
       .run(async ({ page, intakeRegistry, flushEvents, withBrowserLogs }) => {
         await page.evaluate(() => fetch('/uncompressed-script.js'))
@@ -75,7 +75,7 @@ test.describe('network efficiency guardrails', () => {
         })
       })
 
-    createTest('should not forward network-efficiency-guardrails violations when not in forwardReports')
+    createTest('should not forward network-efficiency-guardrails violations when not opted in')
       .withLogs({ forwardReports: [] })
       .withBasePath('/?network-efficiency-guardrails=true')
       .run(async ({ page, intakeRegistry, flushEvents, withBrowserLogs }) => {