From dec07c4c3496b0ada0a8a439d45b8d1f6eee9135 Mon Sep 17 00:00:00 2001 From: Marco Schaefer <47627413+codecapitano@users.noreply.github.com> Date: Mon, 10 Feb 2025 15:07:32 +0100 Subject: [PATCH] Update-faro-versions-in-grafana-packages (#100354) * update faro versions in grafana-runtime * update faro packages in root * update Faro version in Grafana UI * upgrade faro version in grafana-prometheus * replace deprecated type --- package.json | 6 +-- packages/grafana-prometheus/package.json | 2 +- packages/grafana-runtime/package.json | 2 +- packages/grafana-ui/package.json | 2 +- .../GrafanaJavascriptAgentBackend.ts | 4 +- yarn.lock | 52 +++++++++++-------- 6 files changed, 39 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index fc88ff26ab6..c3d81624ad9 100644 --- a/package.json +++ b/package.json @@ -263,9 +263,9 @@ "@grafana/azure-sdk": "0.0.5", "@grafana/data": "workspace:*", "@grafana/e2e-selectors": "workspace:*", - "@grafana/faro-core": "^1.13.1", - "@grafana/faro-web-sdk": "^1.13.1", - "@grafana/faro-web-tracing": "^1.13.1", + "@grafana/faro-core": "^1.13.2", + "@grafana/faro-web-sdk": "^1.13.2", + "@grafana/faro-web-tracing": "^1.13.2", "@grafana/flamegraph": "workspace:*", "@grafana/google-sdk": "0.1.2", "@grafana/lezer-logql": "0.2.7", diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json index 6a0b4e81593..27577e85c5b 100644 --- a/packages/grafana-prometheus/package.json +++ b/packages/grafana-prometheus/package.json @@ -39,7 +39,7 @@ "@emotion/css": "11.13.5", "@floating-ui/react": "0.27.3", "@grafana/data": "11.6.0-pre", - "@grafana/faro-web-sdk": "1.12.3", + "@grafana/faro-web-sdk": "^1.13.2", "@grafana/llm": "0.12.0", "@grafana/plugin-ui": "0.10.1", "@grafana/runtime": "11.6.0-pre", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 085b10800f2..9a83e3cde67 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -39,7 +39,7 @@ "dependencies": { "@grafana/data": "11.6.0-pre", "@grafana/e2e-selectors": "11.6.0-pre", - "@grafana/faro-web-sdk": "^1.3.6", + "@grafana/faro-web-sdk": "^1.13.2", "@grafana/schema": "11.6.0-pre", "@grafana/ui": "11.6.0-pre", "history": "4.10.1", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index c7bc33a0a57..b693a8fb5ac 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -52,7 +52,7 @@ "@floating-ui/react": "0.27.3", "@grafana/data": "11.6.0-pre", "@grafana/e2e-selectors": "11.6.0-pre", - "@grafana/faro-web-sdk": "^1.3.6", + "@grafana/faro-web-sdk": "^1.13.2", "@grafana/schema": "11.6.0-pre", "@hello-pangea/dnd": "17.0.0", "@leeoniya/ufuzzy": "1.0.18", 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 fb181d2030e..3af977436d0 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 @@ -5,12 +5,12 @@ import { BrowserConfig, ErrorsInstrumentation, ConsoleInstrumentation, - ConsoleInstrumentationOptions, WebVitalsInstrumentation, SessionInstrumentation, FetchTransport, type Instrumentation, getWebInstrumentations, + Config, } from '@grafana/faro-web-sdk'; import { TracingInstrumentation } from '@grafana/faro-web-tracing'; import { EchoBackend, EchoEvent, EchoEventType } from '@grafana/runtime'; @@ -61,7 +61,7 @@ export class GrafanaJavascriptAgentBackend ]; const transports: BaseTransport[] = [new EchoSrvTransport({ ignoreUrls })]; - const consoleInstrumentationOptions: ConsoleInstrumentationOptions = + const consoleInstrumentationOptions: Config['consoleInstrumentation'] = options.allInstrumentationsEnabled || options.consoleInstrumentalizationEnabled ? { serializeErrors: true, diff --git a/yarn.lock b/yarn.lock index 23df6d88201..4f4260e4e94 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3331,33 +3331,43 @@ __metadata: languageName: node linkType: hard -"@grafana/faro-web-sdk@npm:1.12.3, @grafana/faro-web-sdk@npm:^1.3.6": - version: 1.12.3 - resolution: "@grafana/faro-web-sdk@npm:1.12.3" +"@grafana/faro-core@npm:^1.13.2": + version: 1.13.2 + resolution: "@grafana/faro-core@npm:1.13.2" dependencies: - "@grafana/faro-core": "npm:^1.12.3" + "@opentelemetry/api": "npm:^1.9.0" + "@opentelemetry/otlp-transformer": "npm:^0.57.1" + checksum: 10/513fabf5e90121e1e0a28d36b61aa994b5ad556635366be518e2c23acbaa43e1d0ac744929bfb5930fb1776a2fc6eba33190ce08c058007555e136078987332c + languageName: node + linkType: hard + +"@grafana/faro-web-sdk@npm:^1.13.2": + version: 1.13.2 + resolution: "@grafana/faro-web-sdk@npm:1.13.2" + dependencies: + "@grafana/faro-core": "npm:^1.13.1" ua-parser-js: "npm:^1.0.32" web-vitals: "npm:^4.0.1" - checksum: 10/433b118ff5b8bc231e209902c20b8a645efe6efd9ecc4ef57947111fa076842becc9760b5bcc8957c1f04cd20c801241ba9cca0a6d4637b8aa2b034d7a7c1888 + checksum: 10/a6896cbbe3b89867a23ffa4f482eb9510d0e9cd637c92a9e04e06157471bb7ffd35d68b7f6077791393e2203cad69f48ade00e86e54d454da10bbb6179cdc357 languageName: node linkType: hard -"@grafana/faro-web-sdk@npm:^1.13.1": - version: 1.13.1 - resolution: "@grafana/faro-web-sdk@npm:1.13.1" +"@grafana/faro-web-sdk@npm:^1.3.6": + version: 1.12.3 + resolution: "@grafana/faro-web-sdk@npm:1.12.3" dependencies: - "@grafana/faro-core": "npm:^1.13.1" + "@grafana/faro-core": "npm:^1.12.3" ua-parser-js: "npm:^1.0.32" web-vitals: "npm:^4.0.1" - checksum: 10/c06e0b5eb179ab3e5d29ec856a45f1c0e1e8980f1fc5b03500e3ca3ed725b74aae709abb0749f2053b532c20c28b937fa916101f3466f5fd30e979bbb826f151 + checksum: 10/433b118ff5b8bc231e209902c20b8a645efe6efd9ecc4ef57947111fa076842becc9760b5bcc8957c1f04cd20c801241ba9cca0a6d4637b8aa2b034d7a7c1888 languageName: node linkType: hard -"@grafana/faro-web-tracing@npm:^1.13.1": - version: 1.13.1 - resolution: "@grafana/faro-web-tracing@npm:1.13.1" +"@grafana/faro-web-tracing@npm:^1.13.2": + version: 1.13.2 + resolution: "@grafana/faro-web-tracing@npm:1.13.2" dependencies: - "@grafana/faro-web-sdk": "npm:^1.13.1" + "@grafana/faro-web-sdk": "npm:^1.13.2" "@opentelemetry/api": "npm:^1.9.0" "@opentelemetry/context-zone": "npm:1.30.1" "@opentelemetry/core": "npm:^1.30.0" @@ -3369,7 +3379,7 @@ __metadata: "@opentelemetry/resources": "npm:^1.30.0" "@opentelemetry/sdk-trace-web": "npm:^1.30.0" "@opentelemetry/semantic-conventions": "npm:^1.28.0" - checksum: 10/378f235b384d4b53c32d5f7779a57114e48f7044cd6205fede8e368fc26f5d872d0146803159e82ed6b7a19b43b4317e867af7f0b8e9f90f63aa0dcb42db156d + checksum: 10/bfc67e073457f50d3f5c95d47dfadc900358c08bd1b7d65db2c08bd2b45edcd6ac661bfa82683f1c9ea3710946152aa441a5db665e1e3e578de186fde51fe887 languageName: node linkType: hard @@ -3622,7 +3632,7 @@ __metadata: "@floating-ui/react": "npm:0.27.3" "@grafana/data": "npm:11.6.0-pre" "@grafana/e2e-selectors": "npm:11.6.0-pre" - "@grafana/faro-web-sdk": "npm:1.12.3" + "@grafana/faro-web-sdk": "npm:^1.13.2" "@grafana/llm": "npm:0.12.0" "@grafana/plugin-ui": "npm:0.10.1" "@grafana/runtime": "npm:11.6.0-pre" @@ -3729,7 +3739,7 @@ __metadata: dependencies: "@grafana/data": "npm:11.6.0-pre" "@grafana/e2e-selectors": "npm:11.6.0-pre" - "@grafana/faro-web-sdk": "npm:^1.3.6" + "@grafana/faro-web-sdk": "npm:^1.13.2" "@grafana/schema": "npm:11.6.0-pre" "@grafana/tsconfig": "npm:^2.0.0" "@grafana/ui": "npm:11.6.0-pre" @@ -4030,7 +4040,7 @@ __metadata: "@floating-ui/react": "npm:0.27.3" "@grafana/data": "npm:11.6.0-pre" "@grafana/e2e-selectors": "npm:11.6.0-pre" - "@grafana/faro-web-sdk": "npm:^1.3.6" + "@grafana/faro-web-sdk": "npm:^1.13.2" "@grafana/schema": "npm:11.6.0-pre" "@grafana/tsconfig": "npm:^2.0.0" "@hello-pangea/dnd": "npm:17.0.0" @@ -18142,9 +18152,9 @@ __metadata: "@grafana/e2e-selectors": "workspace:*" "@grafana/eslint-config": "npm:8.0.0" "@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules" - "@grafana/faro-core": "npm:^1.13.1" - "@grafana/faro-web-sdk": "npm:^1.13.1" - "@grafana/faro-web-tracing": "npm:^1.13.1" + "@grafana/faro-core": "npm:^1.13.2" + "@grafana/faro-web-sdk": "npm:^1.13.2" + "@grafana/faro-web-tracing": "npm:^1.13.2" "@grafana/flamegraph": "workspace:*" "@grafana/google-sdk": "npm:0.1.2" "@grafana/lezer-logql": "npm:0.2.7"