From b0bf2006e5c78fb3363c84f52f68edb13e5c8430 Mon Sep 17 00:00:00 2001 From: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com> Date: Tue, 10 Feb 2026 11:43:30 +0100 Subject: [PATCH] Chore: Upgrade Grafana Faro to v2, removing `web_vitals_attribution_enabled` (#117516) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Chore: Upgrade Grafana Faro to v2.2.2 Upgrades @grafana/faro-* packages from v1.19.0 to v2.2.2 and removes the webVitalsAttribution configuration option which is now always enabled in Faro v2. Closes #117234 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 * Remove WebVitalsAttributionEnabled field from Go config struct 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 * Add NavigationInstrumentation to test * bump to 2.2.3 --------- Co-authored-by: Claude Sonnet 4.5 --- conf/defaults.ini | 4 - conf/sample.ini | 4 - .../setup-grafana/configure-grafana/_index.md | 4 - package.json | 6 +- packages/grafana-data/src/types/config.ts | 1 - packages/grafana-runtime/src/config.ts | 1 - .../setting_grafana_javascript_agent.go | 2 - .../GrafanaJavascriptAgentBackend.test.ts | 32 +- .../GrafanaJavascriptAgentBackend.ts | 1 - .../grafana-javascript-agent/types.ts | 1 - public/app/core/services/echo/init.ts | 1 - yarn.lock | 299 ++++++++++++++---- 12 files changed, 254 insertions(+), 102 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 9370c0cc97f..f0d173d91be 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -1245,10 +1245,6 @@ instrumentations_csp_enabled = true # See https://grafana.com/docs/grafana-cloud/monitor-applications/frontend-observability/instrument/tracing-instrumentation/ instrumentations_tracing_enabled = true -# Enables sending attribution data for web vitals with the Performance instrumentation. -# See https://grafana.com/docs/grafana-cloud/monitor-applications/frontend-observability/instrument/web-vitals/#web-vitals-attribution-data -web_vitals_attribution_enabled = true - # Requests per second limit enforced per an extended period, for Grafana backend log ingestion endpoint (/log). log_endpoint_requests_per_second_limit = 3 diff --git a/conf/sample.ini b/conf/sample.ini index ff2fdfb1711..f09448e573e 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -1219,10 +1219,6 @@ # See https://grafana.com/docs/grafana-cloud/monitor-applications/frontend-observability/instrument/tracing-instrumentation/ ;instrumentations_tracing_enabled = true -# Enables sending attribution data for web vitals with the Performance instrumentation. -# See https://grafana.com/docs/grafana-cloud/monitor-applications/frontend-observability/instrument/web-vitals/#web-vitals-attribution-data -;web_vitals_attribution_enabled = true - # Enables the bot filter for the Grafana Faro JavaScript agent integration. Default is `false`. When enabled, it will filter out requests from known bots and crawlers. ;bot_filter_enabled = false diff --git a/docs/sources/setup-grafana/configure-grafana/_index.md b/docs/sources/setup-grafana/configure-grafana/_index.md index d9c5f524bd3..cab09d9c80a 100644 --- a/docs/sources/setup-grafana/configure-grafana/_index.md +++ b/docs/sources/setup-grafana/configure-grafana/_index.md @@ -1672,10 +1672,6 @@ Enables the [Content Security Policy Violations instrumentation](https://grafana Enables the [Tracing instrumentation](https://grafana.com/docs/grafana-cloud/monitor-applications/frontend-observability/instrument/tracing-instrumentation/) for Grafana Faro, defaults to `true`. -#### `web_vitals_attribution_enabled` - -Enables sending [attribution data for web vitals](https://grafana.com/docs/grafana-cloud/monitor-applications/frontend-observability/instrument/web-vitals/#web-vitals-attribution-data) with the Performance instrumentation, defaults to `true`. - #### `log_endpoint_requests_per_second_limit` Requests per second limit enforced per an extended period, for Grafana backend log ingestion endpoint, `/log-grafana-javascript-agent`. Default is `3`. diff --git a/package.json b/package.json index 9447211ebf4..ac75077d71f 100644 --- a/package.json +++ b/package.json @@ -282,9 +282,9 @@ "@grafana/azure-sdk": "0.0.8", "@grafana/data": "workspace:*", "@grafana/e2e-selectors": "workspace:*", - "@grafana/faro-core": "^1.19.0", - "@grafana/faro-web-sdk": "^1.19.0", - "@grafana/faro-web-tracing": "^1.19.0", + "@grafana/faro-core": "^2.2.3", + "@grafana/faro-web-sdk": "^2.2.3", + "@grafana/faro-web-tracing": "^2.2.3", "@grafana/flamegraph": "workspace:*", "@grafana/google-sdk": "0.3.5", "@grafana/i18n": "workspace:*", diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts index c57f02ca0f4..b00749365e8 100644 --- a/packages/grafana-data/src/types/config.ts +++ b/packages/grafana-data/src/types/config.ts @@ -105,7 +105,6 @@ export interface GrafanaJavascriptAgentConfig { performanceInstrumentalizationEnabled: boolean; cspInstrumentalizationEnabled: boolean; tracingInstrumentalizationEnabled: boolean; - webVitalsAttribution: boolean; } export interface UnifiedAlertingStateHistoryConfig { diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts index c8b745481b6..84f7b3ef905 100644 --- a/packages/grafana-runtime/src/config.ts +++ b/packages/grafana-runtime/src/config.ts @@ -162,7 +162,6 @@ export class GrafanaBootConfig { performanceInstrumentalizationEnabled: false, cspInstrumentalizationEnabled: false, tracingInstrumentalizationEnabled: false, - webVitalsAttribution: false, internalLoggerLevel: 0, botFilterEnabled: false, }; diff --git a/pkg/setting/setting_grafana_javascript_agent.go b/pkg/setting/setting_grafana_javascript_agent.go index cb07b818597..3c2e6e88f70 100644 --- a/pkg/setting/setting_grafana_javascript_agent.go +++ b/pkg/setting/setting_grafana_javascript_agent.go @@ -13,7 +13,6 @@ type GrafanaJavascriptAgent struct { PerformanceInstrumentalizationEnabled bool `json:"performanceInstrumentalizationEnabled"` CSPInstrumentalizationEnabled bool `json:"cspInstrumentalizationEnabled"` TracingInstrumentalizationEnabled bool `json:"tracingInstrumentalizationEnabled"` - WebVitalsAttributionEnabled bool `json:"webVitalsAttributionEnabled"` BotFilterEnabled bool `json:"botFilterEnabled"` } @@ -32,7 +31,6 @@ func (cfg *Cfg) readGrafanaJavascriptAgentConfig() { PerformanceInstrumentalizationEnabled: raw.Key("instrumentations_performance_enabled").MustBool(true), CSPInstrumentalizationEnabled: raw.Key("instrumentations_csp_enabled").MustBool(true), TracingInstrumentalizationEnabled: raw.Key("instrumentations_tracing_enabled").MustBool(true), - WebVitalsAttributionEnabled: raw.Key("web_vitals_attribution_enabled").MustBool(true), BotFilterEnabled: raw.Key("bot_filter_enabled").MustBool(false), } } diff --git a/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts b/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts index a2394ca414d..db36cbb8a9c 100644 --- a/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts +++ b/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts @@ -10,6 +10,7 @@ import { ErrorsInstrumentation, WebVitalsInstrumentation, ViewInstrumentation, + NavigationInstrumentation, } from '@grafana/faro-web-sdk'; import { TracingInstrumentation } from '@grafana/faro-web-tracing'; @@ -75,7 +76,6 @@ describe('GrafanaJavascriptAgentEchoBackend', () => { const options: GrafanaJavascriptAgentBackendOptions = { customEndpoint: '/log-grafana-javascript-agent', - webVitalsAttribution: true, consoleInstrumentalizationEnabled: true, performanceInstrumentalizationEnabled: true, cspInstrumentalizationEnabled: true, @@ -145,20 +145,6 @@ describe('GrafanaJavascriptAgentEchoBackend', () => { new GrafanaJavascriptAgentBackend(opts); let lastInstrumentations = initializeFaroMock.mock.calls.at(-1)?.[0].instrumentations; - expect(lastInstrumentations).toHaveLength(5); - expect(lastInstrumentations).toEqual( - expect.arrayContaining([ - expect.any(SessionInstrumentation), - expect.any(UserActionInstrumentation), - expect.any(ErrorsInstrumentation), - expect.any(WebVitalsInstrumentation), - expect.any(ViewInstrumentation), - ]) - ); - - opts.tracingInstrumentalizationEnabled = true; - new GrafanaJavascriptAgentBackend(opts); - lastInstrumentations = initializeFaroMock.mock.calls.at(-1)?.[0].instrumentations; expect(lastInstrumentations).toHaveLength(6); expect(lastInstrumentations).toEqual( expect.arrayContaining([ @@ -167,6 +153,22 @@ describe('GrafanaJavascriptAgentEchoBackend', () => { expect.any(ErrorsInstrumentation), expect.any(WebVitalsInstrumentation), expect.any(ViewInstrumentation), + expect.any(NavigationInstrumentation), + ]) + ); + + opts.tracingInstrumentalizationEnabled = true; + new GrafanaJavascriptAgentBackend(opts); + lastInstrumentations = initializeFaroMock.mock.calls.at(-1)?.[0].instrumentations; + expect(lastInstrumentations).toHaveLength(7); + expect(lastInstrumentations).toEqual( + expect.arrayContaining([ + expect.any(SessionInstrumentation), + expect.any(UserActionInstrumentation), + expect.any(ErrorsInstrumentation), + expect.any(WebVitalsInstrumentation), + expect.any(ViewInstrumentation), + expect.any(NavigationInstrumentation), expect.any(TracingInstrumentation), ]) ); diff --git a/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.ts b/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.ts index 872aedc4956..d668c18d04d 100644 --- a/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.ts +++ b/public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.ts @@ -77,7 +77,6 @@ export class GrafanaJavascriptAgentBackend consoleInstrumentation: { serializeErrors: true, }, - trackWebVitalsAttribution: options.webVitalsAttribution, ignoreErrors: [ 'ResizeObserver loop limit exceeded', 'ResizeObserver loop completed', diff --git a/public/app/core/services/echo/backends/grafana-javascript-agent/types.ts b/public/app/core/services/echo/backends/grafana-javascript-agent/types.ts index 049fbaf147e..c8080ba6a49 100644 --- a/public/app/core/services/echo/backends/grafana-javascript-agent/types.ts +++ b/public/app/core/services/echo/backends/grafana-javascript-agent/types.ts @@ -18,7 +18,6 @@ export interface GrafanaJavascriptAgentBackendOptions { customEndpoint?: string; internalLoggerLevel?: InternalLoggerLevel; - webVitalsAttribution: boolean; consoleInstrumentalizationEnabled: boolean; performanceInstrumentalizationEnabled: boolean; cspInstrumentalizationEnabled: boolean; diff --git a/public/app/core/services/echo/init.ts b/public/app/core/services/echo/init.ts index 9fce1a539ef..a49583c2330 100644 --- a/public/app/core/services/echo/init.ts +++ b/public/app/core/services/echo/init.ts @@ -107,7 +107,6 @@ async function initFaroBackend() { performanceInstrumentalizationEnabled: config.grafanaJavascriptAgent.performanceInstrumentalizationEnabled, cspInstrumentalizationEnabled: config.grafanaJavascriptAgent.cspInstrumentalizationEnabled, tracingInstrumentalizationEnabled: config.grafanaJavascriptAgent.tracingInstrumentalizationEnabled, - webVitalsAttribution: config.grafanaJavascriptAgent.webVitalsAttribution, internalLoggerLevel: config.grafanaJavascriptAgent.internalLoggerLevel, botFilterEnabled: config.grafanaJavascriptAgent.botFilterEnabled, }) diff --git a/yarn.lock b/yarn.lock index 660197500b1..b21c007c2ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3502,7 +3502,17 @@ __metadata: languageName: node linkType: hard -"@grafana/faro-web-sdk@npm:^1.13.2, @grafana/faro-web-sdk@npm:^1.19.0": +"@grafana/faro-core@npm:^2.2.3": + version: 2.2.3 + resolution: "@grafana/faro-core@npm:2.2.3" + dependencies: + "@opentelemetry/api": "npm:^1.9.0" + "@opentelemetry/otlp-transformer": "npm:^0.211.0" + checksum: 10/6493205d3fe74a9cf8cab4f085a669bd0bfbe716dc72bf05b175afd795ea13d19e0f70b4deb1adb7b77f2c12ef04c3caded0d785ccd294bf9bbc6e71e5f51686 + languageName: node + linkType: hard + +"@grafana/faro-web-sdk@npm:^1.13.2": version: 1.19.0 resolution: "@grafana/faro-web-sdk@npm:1.19.0" dependencies: @@ -3513,22 +3523,33 @@ __metadata: languageName: node linkType: hard -"@grafana/faro-web-tracing@npm:^1.19.0": - version: 1.19.0 - resolution: "@grafana/faro-web-tracing@npm:1.19.0" +"@grafana/faro-web-sdk@npm:^2.2.3": + version: 2.2.3 + resolution: "@grafana/faro-web-sdk@npm:2.2.3" dependencies: - "@grafana/faro-web-sdk": "npm:^1.19.0" + "@grafana/faro-core": "npm:^2.2.3" + ua-parser-js: "npm:1.0.41" + web-vitals: "npm:^5.1.0" + checksum: 10/efbe71940094aa129d57220c882ccdab32591ffa5b4993bd6ddd375cde53e9a7ec843fb05bc3b49c1f8c158aeeb67315232188e2810145f5df2bf79dfb31fe71 + languageName: node + linkType: hard + +"@grafana/faro-web-tracing@npm:^2.2.3": + version: 2.2.3 + resolution: "@grafana/faro-web-tracing@npm:2.2.3" + dependencies: + "@grafana/faro-web-sdk": "npm:^2.2.3" "@opentelemetry/api": "npm:^1.9.0" "@opentelemetry/core": "npm:^2.0.0" - "@opentelemetry/exporter-trace-otlp-http": "npm:^0.202.0" - "@opentelemetry/instrumentation": "npm:^0.202.0" - "@opentelemetry/instrumentation-fetch": "npm:^0.202.0" - "@opentelemetry/instrumentation-xml-http-request": "npm:^0.202.0" - "@opentelemetry/otlp-transformer": "npm:^0.202.0" + "@opentelemetry/exporter-trace-otlp-http": "npm:^0.211.0" + "@opentelemetry/instrumentation": "npm:^0.211.0" + "@opentelemetry/instrumentation-fetch": "npm:^0.211.0" + "@opentelemetry/instrumentation-xml-http-request": "npm:^0.211.0" + "@opentelemetry/otlp-transformer": "npm:^0.211.0" "@opentelemetry/resources": "npm:^2.0.0" "@opentelemetry/sdk-trace-web": "npm:^2.0.0" "@opentelemetry/semantic-conventions": "npm:^1.32.0" - checksum: 10/da7e0cd6b3fb5269d26530bdb212b005698ea489748c090fe6867bdb501e124c69ea8157a88f6e6115472500c4358f86001c104ccb24b6c9b8ad24c3b525917f + checksum: 10/c781b4564adea79c68925d438547d4b00bf409579db944ec6cfe27b8290d04f3a5401c25f941dde9a27c2f1607fd8b840c18e5a7160dc27f63650ba2a740e177 languageName: node linkType: hard @@ -6553,6 +6574,15 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/api-logs@npm:0.211.0": + version: 0.211.0 + resolution: "@opentelemetry/api-logs@npm:0.211.0" + dependencies: + "@opentelemetry/api": "npm:^1.3.0" + checksum: 10/d2e7ac9d9985bec924cbb5b2ef4bd66cb59a3b13e53133a0d975d847f579580ec0cd7612e8bc6b780268dae9b094b8c7571ef4354c150b0a54904442e4a8f456 + languageName: node + linkType: hard + "@opentelemetry/api-metrics@npm:0.25.0": version: 0.25.0 resolution: "@opentelemetry/api-metrics@npm:0.25.0" @@ -6592,6 +6622,17 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/core@npm:2.5.0": + version: 2.5.0 + resolution: "@opentelemetry/core@npm:2.5.0" + dependencies: + "@opentelemetry/semantic-conventions": "npm:^1.29.0" + peerDependencies: + "@opentelemetry/api": ">=1.0.0 <1.10.0" + checksum: 10/62cb4721af697fe61b6a227fe1675e2e9a440ad6b04e2af6e1f60ca6b714fcd432bdf1cc2595b105fdf2a4223bc5d3ff37a7b2af67b4ea2513e6b99c3e10a709 + languageName: node + linkType: hard + "@opentelemetry/exporter-collector@npm:0.25.0": version: 0.25.0 resolution: "@opentelemetry/exporter-collector@npm:0.25.0" @@ -6607,75 +6648,92 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/exporter-trace-otlp-http@npm:^0.202.0": - version: 0.202.0 - resolution: "@opentelemetry/exporter-trace-otlp-http@npm:0.202.0" +"@opentelemetry/exporter-trace-otlp-http@npm:^0.211.0": + version: 0.211.0 + resolution: "@opentelemetry/exporter-trace-otlp-http@npm:0.211.0" dependencies: - "@opentelemetry/core": "npm:2.0.1" - "@opentelemetry/otlp-exporter-base": "npm:0.202.0" - "@opentelemetry/otlp-transformer": "npm:0.202.0" - "@opentelemetry/resources": "npm:2.0.1" - "@opentelemetry/sdk-trace-base": "npm:2.0.1" + "@opentelemetry/core": "npm:2.5.0" + "@opentelemetry/otlp-exporter-base": "npm:0.211.0" + "@opentelemetry/otlp-transformer": "npm:0.211.0" + "@opentelemetry/resources": "npm:2.5.0" + "@opentelemetry/sdk-trace-base": "npm:2.5.0" peerDependencies: "@opentelemetry/api": ^1.3.0 - checksum: 10/f9e60e51b5dcca3d4d32f2091f04faa2bcaf677b9f8a88990c8cdc7c6345e4244e46c4e8df1c336fc6f741aea092407032ade1236089eb729196e6fcdc055ad0 + checksum: 10/2dbd3bbbbe6106ffd4821e906ca2581dad64e4aa65c6048a2ff1bb63bd2f285869a49874570a7cf854b6419008abcb9d92296a9f77e5896caecacf214009f684 languageName: node linkType: hard -"@opentelemetry/instrumentation-fetch@npm:^0.202.0": - version: 0.202.0 - resolution: "@opentelemetry/instrumentation-fetch@npm:0.202.0" +"@opentelemetry/instrumentation-fetch@npm:^0.211.0": + version: 0.211.0 + resolution: "@opentelemetry/instrumentation-fetch@npm:0.211.0" dependencies: - "@opentelemetry/core": "npm:2.0.1" - "@opentelemetry/instrumentation": "npm:0.202.0" - "@opentelemetry/sdk-trace-web": "npm:2.0.1" + "@opentelemetry/core": "npm:2.5.0" + "@opentelemetry/instrumentation": "npm:0.211.0" + "@opentelemetry/sdk-trace-web": "npm:2.5.0" "@opentelemetry/semantic-conventions": "npm:^1.29.0" peerDependencies: "@opentelemetry/api": ^1.3.0 - checksum: 10/c3e87a75878b7b16f5c9ac66c73b6affb8d9d6e5ba95aa19c05a0f73c03d831e7d60e586d9a5bdf76e962acaadbe989b351fefe1908ab439afcd0158bded10e6 + checksum: 10/40847c554029a62eb9c24ab0973d2f71933ffc3410061750b18e943dd4de9437b45e3d737a6d78b5503d7d7da24a8e54533931c18a7235df57a249be77928d33 languageName: node linkType: hard -"@opentelemetry/instrumentation-xml-http-request@npm:^0.202.0": - version: 0.202.0 - resolution: "@opentelemetry/instrumentation-xml-http-request@npm:0.202.0" +"@opentelemetry/instrumentation-xml-http-request@npm:^0.211.0": + version: 0.211.0 + resolution: "@opentelemetry/instrumentation-xml-http-request@npm:0.211.0" dependencies: - "@opentelemetry/core": "npm:2.0.1" - "@opentelemetry/instrumentation": "npm:0.202.0" - "@opentelemetry/sdk-trace-web": "npm:2.0.1" + "@opentelemetry/core": "npm:2.5.0" + "@opentelemetry/instrumentation": "npm:0.211.0" + "@opentelemetry/sdk-trace-web": "npm:2.5.0" "@opentelemetry/semantic-conventions": "npm:^1.29.0" peerDependencies: "@opentelemetry/api": ^1.3.0 - checksum: 10/6a2c76374f5af2d37318f5a689447a99ecc65c7c5546f3421171c870d5ddf1536e30f6fd63d8046cbc3e4cbf737529bae304959d971beefaf7f730fefb9e663c + checksum: 10/36399fff9fa78e83144f40c875f4e69f08041002ff26fba9ff3dcde57bea093590ddaaef93fcde8711471222bcfbd1b28a44369983f8d711618358bd5e32b054 languageName: node linkType: hard -"@opentelemetry/instrumentation@npm:0.202.0, @opentelemetry/instrumentation@npm:^0.202.0": - version: 0.202.0 - resolution: "@opentelemetry/instrumentation@npm:0.202.0" +"@opentelemetry/instrumentation@npm:0.211.0, @opentelemetry/instrumentation@npm:^0.211.0": + version: 0.211.0 + resolution: "@opentelemetry/instrumentation@npm:0.211.0" dependencies: - "@opentelemetry/api-logs": "npm:0.202.0" - import-in-the-middle: "npm:^1.8.1" - require-in-the-middle: "npm:^7.1.1" + "@opentelemetry/api-logs": "npm:0.211.0" + import-in-the-middle: "npm:^2.0.0" + require-in-the-middle: "npm:^8.0.0" peerDependencies: "@opentelemetry/api": ^1.3.0 - checksum: 10/da1db1ebc4ca847cc68d894b2e3a6c6552851d93af8ea793d42474e920f710664575c8991dc269e1a83fcf8f5abdda2cc724fa24e9cc4ae19fa6f70eb68ffc0e + checksum: 10/d9efa3bf9108fec3869194cb52b0761ca4d003629c7458ac006c04a81991744d7b836bf5ec2cb153142934d446e3d2304c2b5aa7248ba17f667a680839836e39 languageName: node linkType: hard -"@opentelemetry/otlp-exporter-base@npm:0.202.0": - version: 0.202.0 - resolution: "@opentelemetry/otlp-exporter-base@npm:0.202.0" +"@opentelemetry/otlp-exporter-base@npm:0.211.0": + version: 0.211.0 + resolution: "@opentelemetry/otlp-exporter-base@npm:0.211.0" dependencies: - "@opentelemetry/core": "npm:2.0.1" - "@opentelemetry/otlp-transformer": "npm:0.202.0" + "@opentelemetry/core": "npm:2.5.0" + "@opentelemetry/otlp-transformer": "npm:0.211.0" peerDependencies: "@opentelemetry/api": ^1.3.0 - checksum: 10/229778895ba1971451a8b1ec8a4787b0cdba337c87f3ca6aaf6d649f5e2b26439ba1befa36d31824fffa3cef62382792680ec70194f57aac6ebe98e95acecc69 + checksum: 10/c9c223bcd1cf64a27a74d30c7637679136e66717a9e42eaa217948df0230f9cd2cc7311b9201cd4717aa43c77fd92b867e91408c21aa3dd412be180573ae08b2 languageName: node linkType: hard -"@opentelemetry/otlp-transformer@npm:0.202.0, @opentelemetry/otlp-transformer@npm:^0.202.0": +"@opentelemetry/otlp-transformer@npm:0.211.0, @opentelemetry/otlp-transformer@npm:^0.211.0": + version: 0.211.0 + resolution: "@opentelemetry/otlp-transformer@npm:0.211.0" + dependencies: + "@opentelemetry/api-logs": "npm:0.211.0" + "@opentelemetry/core": "npm:2.5.0" + "@opentelemetry/resources": "npm:2.5.0" + "@opentelemetry/sdk-logs": "npm:0.211.0" + "@opentelemetry/sdk-metrics": "npm:2.5.0" + "@opentelemetry/sdk-trace-base": "npm:2.5.0" + protobufjs: "npm:8.0.0" + peerDependencies: + "@opentelemetry/api": ^1.3.0 + checksum: 10/65f98ac066bb627e420ebc6671f89180a2771b0be1b34effe9d83ea02906c125533b38a262084849f3a05317889e0ca60d17dc956c37f622e1175345e7c00ac5 + languageName: node + linkType: hard + +"@opentelemetry/otlp-transformer@npm:^0.202.0": version: 0.202.0 resolution: "@opentelemetry/otlp-transformer@npm:0.202.0" dependencies: @@ -6716,6 +6774,18 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/resources@npm:2.5.0": + version: 2.5.0 + resolution: "@opentelemetry/resources@npm:2.5.0" + dependencies: + "@opentelemetry/core": "npm:2.5.0" + "@opentelemetry/semantic-conventions": "npm:^1.29.0" + peerDependencies: + "@opentelemetry/api": ">=1.3.0 <1.10.0" + checksum: 10/0400e5db66c2bab05424b6701badd891cba61cf0a4c07a9c01d74ff131d27f5ea55846d2ae59af2eb9c3fb48e71097eacb529224f2c6498a0a2306dd8a890bbb + languageName: node + linkType: hard + "@opentelemetry/sdk-logs@npm:0.202.0": version: 0.202.0 resolution: "@opentelemetry/sdk-logs@npm:0.202.0" @@ -6729,6 +6799,19 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/sdk-logs@npm:0.211.0": + version: 0.211.0 + resolution: "@opentelemetry/sdk-logs@npm:0.211.0" + dependencies: + "@opentelemetry/api-logs": "npm:0.211.0" + "@opentelemetry/core": "npm:2.5.0" + "@opentelemetry/resources": "npm:2.5.0" + peerDependencies: + "@opentelemetry/api": ">=1.4.0 <1.10.0" + checksum: 10/fd7d4dcfaaee2a93751b2bc5ce504e27eafa66f93b903a7bc2ff9649b8804c1280ec488a51bf95814b0ff6bab827d156cdcd8c9633f0a51a8798710e3b95e825 + languageName: node + linkType: hard + "@opentelemetry/sdk-metrics-base@npm:0.25.0": version: 0.25.0 resolution: "@opentelemetry/sdk-metrics-base@npm:0.25.0" @@ -6755,6 +6838,18 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/sdk-metrics@npm:2.5.0": + version: 2.5.0 + resolution: "@opentelemetry/sdk-metrics@npm:2.5.0" + dependencies: + "@opentelemetry/core": "npm:2.5.0" + "@opentelemetry/resources": "npm:2.5.0" + peerDependencies: + "@opentelemetry/api": ">=1.9.0 <1.10.0" + checksum: 10/911399e56d0d4045ceafb83422bdffe0bfa9e8d75e542d746f18f22fe12654ae52efa5a8dc7fdfe17a6df906a3cf3886191ef655830efc578d70821200d55914 + languageName: node + linkType: hard + "@opentelemetry/sdk-trace-base@npm:0.25.0": version: 0.25.0 resolution: "@opentelemetry/sdk-trace-base@npm:0.25.0" @@ -6782,7 +6877,32 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/sdk-trace-web@npm:2.0.1, @opentelemetry/sdk-trace-web@npm:^2.0.0": +"@opentelemetry/sdk-trace-base@npm:2.5.0": + version: 2.5.0 + resolution: "@opentelemetry/sdk-trace-base@npm:2.5.0" + dependencies: + "@opentelemetry/core": "npm:2.5.0" + "@opentelemetry/resources": "npm:2.5.0" + "@opentelemetry/semantic-conventions": "npm:^1.29.0" + peerDependencies: + "@opentelemetry/api": ">=1.3.0 <1.10.0" + checksum: 10/5a1f72ed8063d452755d9bf834f5b1c83afcaabf3382e8dc4d9f2987768b32097c9307f0fac8efc9f9ce9f1525ac66e5a21d51ae85ed2a426bf91ae1d26c51ed + languageName: node + linkType: hard + +"@opentelemetry/sdk-trace-web@npm:2.5.0": + version: 2.5.0 + resolution: "@opentelemetry/sdk-trace-web@npm:2.5.0" + dependencies: + "@opentelemetry/core": "npm:2.5.0" + "@opentelemetry/sdk-trace-base": "npm:2.5.0" + peerDependencies: + "@opentelemetry/api": ">=1.0.0 <1.10.0" + checksum: 10/73d55594f3c48582e4f233b85f336b06062afd8739c3d3b1f23950cdbb5c681efd6de86c00c97a62b191d0dd8ad5a512df0125ff7f5c7eb901f710028a96258b + languageName: node + linkType: hard + +"@opentelemetry/sdk-trace-web@npm:^2.0.0": version: 2.0.1 resolution: "@opentelemetry/sdk-trace-web@npm:2.0.1" dependencies: @@ -14706,13 +14826,20 @@ __metadata: languageName: node linkType: hard -"cjs-module-lexer@npm:^1.0.0, cjs-module-lexer@npm:^1.2.2, cjs-module-lexer@npm:^1.2.3": +"cjs-module-lexer@npm:^1.0.0, cjs-module-lexer@npm:^1.2.3": version: 1.3.1 resolution: "cjs-module-lexer@npm:1.3.1" checksum: 10/6629188d5ce74b57e5dce2222db851b5496a8d65b533a05957fb24089a3cec8d769378013c375a954c5a0f7522cde6a36d5a65bfd88f5575cb2de3176046fa8e languageName: node linkType: hard +"cjs-module-lexer@npm:^2.2.0": + version: 2.2.0 + resolution: "cjs-module-lexer@npm:2.2.0" + checksum: 10/fc8eb5c1919504366d8260a150d93c4e857740e770467dc59ca0cc34de4b66c93075559a5af65618f359187866b1be40e036f4e1a1bab2f1e06001c216415f74 + languageName: node + linkType: hard + "classnames@npm:2.5.1, classnames@npm:^2.2.1, classnames@npm:^2.2.5, classnames@npm:^2.3.1, classnames@npm:^2.3.2, classnames@npm:^2.5.1": version: 2.5.1 resolution: "classnames@npm:2.5.1" @@ -20478,9 +20605,9 @@ __metadata: "@grafana/e2e-selectors": "workspace:*" "@grafana/eslint-config": "npm:8.2.0" "@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules" - "@grafana/faro-core": "npm:^1.19.0" - "@grafana/faro-web-sdk": "npm:^1.19.0" - "@grafana/faro-web-tracing": "npm:^1.19.0" + "@grafana/faro-core": "npm:^2.2.3" + "@grafana/faro-web-sdk": "npm:^2.2.3" + "@grafana/faro-web-tracing": "npm:^2.2.3" "@grafana/flamegraph": "workspace:*" "@grafana/google-sdk": "npm:0.3.5" "@grafana/i18n": "workspace:*" @@ -21788,15 +21915,15 @@ __metadata: languageName: node linkType: hard -"import-in-the-middle@npm:^1.8.1": - version: 1.11.0 - resolution: "import-in-the-middle@npm:1.11.0" +"import-in-the-middle@npm:^2.0.0": + version: 2.0.6 + resolution: "import-in-the-middle@npm:2.0.6" dependencies: - acorn: "npm:^8.8.2" + acorn: "npm:^8.15.0" acorn-import-attributes: "npm:^1.9.5" - cjs-module-lexer: "npm:^1.2.2" - module-details-from-path: "npm:^1.0.3" - checksum: 10/e6f79c9de3f1c1907856fb48b99cd2273c5f9d78eb72124ddd142382e41b6bdf1f64c028ced9e5dbfd015f282e6e3b48bd1f53dd0452e2f0a26436ee42b005d8 + cjs-module-lexer: "npm:^2.2.0" + module-details-from-path: "npm:^1.0.4" + checksum: 10/8be80d7f2d4ad34e5eb1082925ee2e90844edb65359cad0f5d8e934a09fafeca10e66f50d0b07570bd6b877ff678755d3c2d36d05258cc3541e39fa6aae6ae56 languageName: node linkType: hard @@ -25852,6 +25979,13 @@ __metadata: languageName: node linkType: hard +"module-details-from-path@npm:^1.0.4": + version: 1.0.4 + resolution: "module-details-from-path@npm:1.0.4" + checksum: 10/2ebfada5358492f6ab496b70f70a1042f2ee7a4c79d29467f59ed6704f741fb4461d7cecb5082144ed39a05fec4d19e9ff38b731c76228151be97227240a05b2 + languageName: node + linkType: hard + "module-lookup-amd@npm:^9.0.3": version: 9.0.5 resolution: "module-lookup-amd@npm:9.0.5" @@ -29148,6 +29282,26 @@ __metadata: languageName: node linkType: hard +"protobufjs@npm:8.0.0": + version: 8.0.0 + resolution: "protobufjs@npm:8.0.0" + dependencies: + "@protobufjs/aspromise": "npm:^1.1.2" + "@protobufjs/base64": "npm:^1.1.2" + "@protobufjs/codegen": "npm:^2.0.4" + "@protobufjs/eventemitter": "npm:^1.1.0" + "@protobufjs/fetch": "npm:^1.1.0" + "@protobufjs/float": "npm:^1.0.2" + "@protobufjs/inquire": "npm:^1.1.0" + "@protobufjs/path": "npm:^1.1.2" + "@protobufjs/pool": "npm:^1.1.0" + "@protobufjs/utf8": "npm:^1.1.0" + "@types/node": "npm:>=13.7.0" + long: "npm:^5.0.0" + checksum: 10/f9f2bc0acd37ca85ad4afb030fb3973cb93129e54623d7d36255a0406f852505afae4a94a88b305bca3a6384675bb34c7602dfa64cab6b67f95597234a94681d + languageName: node + linkType: hard + "protobufjs@npm:^7.2.5, protobufjs@npm:^7.3.0": version: 7.3.2 resolution: "protobufjs@npm:7.3.2" @@ -30883,14 +31037,13 @@ __metadata: languageName: node linkType: hard -"require-in-the-middle@npm:^7.1.1": - version: 7.4.0 - resolution: "require-in-the-middle@npm:7.4.0" +"require-in-the-middle@npm:^8.0.0": + version: 8.0.1 + resolution: "require-in-the-middle@npm:8.0.1" dependencies: debug: "npm:^4.3.5" module-details-from-path: "npm:^1.0.3" - resolve: "npm:^1.22.8" - checksum: 10/0ca30ad6a6183423f38599709fc8a670682db85b581a66cb31ea31342e8ba2ce7dca44ee29e8cfe4fb59ffcb0c2b0f9b77d44a10cdc7535c7c2907028e53afbf + checksum: 10/4ce98c681489d383a0ffccb79b06df7a1dffbb31c13f3b713ae2c5a1967597a259e67612507ef69748d83d531bba7c9bb0477211771fe78c685e1d52b1a44b64 languageName: node linkType: hard @@ -34651,6 +34804,15 @@ __metadata: languageName: node linkType: hard +"ua-parser-js@npm:1.0.41": + version: 1.0.41 + resolution: "ua-parser-js@npm:1.0.41" + bin: + ua-parser-js: script/cli.js + checksum: 10/86f2b624ff13f5be86a7cc5172427960493c8c0f703fdc8de340d8701951a1478cdf7a76f1f510932bb25a2fce6a3e0ba750b631f026d85acdc6b2a6b0ba6138 + languageName: node + linkType: hard + "ua-parser-js@npm:^1.0.32": version: 1.0.33 resolution: "ua-parser-js@npm:1.0.33" @@ -35431,6 +35593,13 @@ __metadata: languageName: node linkType: hard +"web-vitals@npm:^5.1.0": + version: 5.1.0 + resolution: "web-vitals@npm:5.1.0" + checksum: 10/3b99e3e5e031257387f59f5e71f84d873b259bc09d560993fff1d0c84e0196a509712bc974666c47f51561f8bb8297ff1c1fdf18d4ebde2345a1cd06dba36021 + languageName: node + linkType: hard + "web-worker@npm:^1.2.0": version: 1.2.0 resolution: "web-worker@npm:1.2.0"