public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade faro-core and faro-web-sdk to 1.0.2 (#64407) (#64695)

Browse Source 
* chore: upgrade faro-core and faro-web-sdk to 1.0.2 (#64407)

With v1.0.2 Faro explicitly closes fetch requests.
This fixes an issue were (headless) chrome browser
still considers those requests as open  which lead to timeouts.

(cherry picked from commit d8a497ee6e)

* fix: add missing setView and getView mocks
This commit is contained in:
Marco Schaefer
2023-03-14 11:05:10 +02:00
committed by GitHub
parent fc8002d9ab
commit 08acfafffd
4 changed files with 70 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+2 -2
View File
@@ -262,8 +262,8 @@
"@grafana/data": "workspace:*",
"@grafana/e2e-selectors": "workspace:*",
"@grafana/experimental": "1.1.0",
"@grafana/faro-core": "1.0.0-beta2",
"@grafana/faro-web-sdk": "1.0.0-beta2",
"@grafana/faro-core": "1.0.2",
"@grafana/faro-web-sdk": "1.0.2",
"@grafana/google-sdk": "0.0.4",
"@grafana/lezer-logql": "0.1.1",
"@grafana/monaco-logql": "^0.0.6",
packages/grafana-runtime/package.json
+1 -1
View File
@@ -39,7 +39,7 @@
"dependencies": {
"@grafana/data": "9.4.4",
"@grafana/e2e-selectors": "9.4.4",
"@grafana/faro-web-sdk": "1.0.0-beta2",
"@grafana/faro-web-sdk": "1.0.2",
"@grafana/ui": "9.4.4",
"@sentry/browser": "6.19.7",
"history": "4.10.1",
public/app/core/services/echo/backends/grafana-javascript-agent/GrafanaJavascriptAgentBackend.test.ts
+4
View File
@@ -99,6 +99,8 @@ describe('GrafanaJavascriptAgentEchoBackend', () => {
getSession: jest.fn(),
resetUser: jest.fn(),
resetSession: jest.fn(),
setView: jest.fn(),
getView: jest.fn(),
},
config: {
globalObjectKey: '',
@@ -193,6 +195,8 @@ describe('GrafanaJavascriptAgentEchoBackend', () => {
getSession: jest.fn(),
resetUser: jest.fn(),
resetSession: jest.fn(),
setView: jest.fn(),
getView: jest.fn(),
},
config: {
globalObjectKey: '',
yarn.lock
+63 -66
View File
@@ -5058,26 +5058,25 @@ __metadata:
languageName: node
linkType: hard
"@grafana/faro-core@npm:1.0.0-beta2, @grafana/faro-core@npm:^1.0.0-beta2":
version: 1.0.0-beta2
resolution: "@grafana/faro-core@npm:1.0.0-beta2"
"@grafana/faro-core@npm:1.0.2, @grafana/faro-core@npm:^1.0.2":
version: 1.0.2
resolution: "@grafana/faro-core@npm:1.0.2"
dependencies:
"@opentelemetry/api": ^1.1.0
"@opentelemetry/api-metrics": ^0.33.0
"@opentelemetry/otlp-transformer": ^0.33.0
fast-deep-equal: ^3.1.3
checksum: 0c807f5212e502313b149b087e3f2c0cebf59bfe95bcd558f6fd421727a6f7eeb735abb12661f9b76e14bbcebca4773763332a1fb992461e4a673f1326a9acce
"@opentelemetry/otlp-transformer": ^0.35.0
checksum: 09c3c6687b955aacd17de73dca319dbb2abda8dd26f5c038618266ffefbc1f915cfe12167cd4b49db5c639ab70b7141bb9794c3cbdc682bb63174f95df9d9dfd
languageName: node
linkType: hard
"@grafana/faro-web-sdk@npm:1.0.0-beta2":
version: 1.0.0-beta2
resolution: "@grafana/faro-web-sdk@npm:1.0.0-beta2"
"@grafana/faro-web-sdk@npm:1.0.2":
version: 1.0.2
resolution: "@grafana/faro-web-sdk@npm:1.0.2"
dependencies:
"@grafana/faro-core": ^1.0.0-beta2
"@grafana/faro-core": ^1.0.2
ua-parser-js: ^1.0.32
web-vitals: ^3.0.4
checksum: 7919c4856653880c71d384b14e8e8a7fa2edc17cf57bdc55dc6afd8a8c94b6787a0b9186540b6fb1c4f6d720de7ec8b3ddd00517a2e8117ede94de5b3f8c5559
web-vitals: ^3.1.1
checksum: ca04add8469778d73e1bc15f057d063d93a88b9d76325c79060848ad3211fa929e30b6a85365981f7bcef023704f9f92f67678311bfed13dd521399c0f00e92f
languageName: node
linkType: hard
@@ -5112,7 +5111,7 @@ __metadata:
dependencies:
"@grafana/data": 9.4.4
"@grafana/e2e-selectors": 9.4.4
"@grafana/faro-web-sdk": 1.0.0-beta2
"@grafana/faro-web-sdk": 1.0.2
"@grafana/tsconfig": ^1.2.0-rc1
"@grafana/ui": 9.4.4
"@rollup/plugin-commonjs": 23.0.2
@@ -7688,7 +7687,7 @@ __metadata:
languageName: node
linkType: hard
"@opentelemetry/api-metrics@npm:0.33.0, @opentelemetry/api-metrics@npm:^0.33.0":
"@opentelemetry/api-metrics@npm:^0.33.0":
version: 0.33.0
resolution: "@opentelemetry/api-metrics@npm:0.33.0"
dependencies:
@@ -7723,14 +7722,14 @@ __metadata:
languageName: node
linkType: hard
"@opentelemetry/core@npm:1.7.0":
version: 1.7.0
resolution: "@opentelemetry/core@npm:1.7.0"
"@opentelemetry/core@npm:1.9.1":
version: 1.9.1
resolution: "@opentelemetry/core@npm:1.9.1"
dependencies:
"@opentelemetry/semantic-conventions": 1.7.0
"@opentelemetry/semantic-conventions": 1.9.1
peerDependencies:
"@opentelemetry/api": ">=1.0.0 <1.3.0"
checksum: 94fcae57c3c2c3a1cff6311246f32a228b216533449bfcec2f8eb03ea023f0ace4e0929c8cf5145772c6f25263d5f2d5d3485a39ab0ced4e11f5a0fed7497e9c
"@opentelemetry/api": ">=1.0.0 <1.5.0"
checksum: 5581a809e2caff142136734634f45255ce9f1ed701cf38629b9e17d91a8d15449b467fb3a7f3d0d8b076f653090e50cc31d3b1db4cfefeda9b6b901c60581024
languageName: node
linkType: hard
@@ -7749,18 +7748,17 @@ __metadata:
languageName: node
linkType: hard
"@opentelemetry/otlp-transformer@npm:^0.33.0":
version: 0.33.0
resolution: "@opentelemetry/otlp-transformer@npm:0.33.0"
"@opentelemetry/otlp-transformer@npm:^0.35.0":
version: 0.35.1
resolution: "@opentelemetry/otlp-transformer@npm:0.35.1"
dependencies:
"@opentelemetry/api-metrics": 0.33.0
"@opentelemetry/core": 1.7.0
"@opentelemetry/resources": 1.7.0
"@opentelemetry/sdk-metrics": 0.33.0
"@opentelemetry/sdk-trace-base": 1.7.0
"@opentelemetry/core": 1.9.1
"@opentelemetry/resources": 1.9.1
"@opentelemetry/sdk-metrics": 1.9.1
"@opentelemetry/sdk-trace-base": 1.9.1
peerDependencies:
"@opentelemetry/api": ">=1.0.0 <1.3.0"
checksum: f2a68957588a5bf7de3974dd210440dc64f29dd93c3f6f79c2e0cf69d3e487432cfec6d2c14752d7ba007f93140a23f8ea39135451e7bf455789b4a2d8ad84d1
"@opentelemetry/api": ">=1.3.0 <1.5.0"
checksum: e0a68b2be28d5535aaaa58be31a5e85b268b42025c8b3a34498f00b019fbd172530b1b484c4257fd330c5890007130eedec288b8fe8f2b85176198f9ffc2507e
languageName: node
linkType: hard
@@ -7776,15 +7774,15 @@ __metadata:
languageName: node
linkType: hard
"@opentelemetry/resources@npm:1.7.0":
version: 1.7.0
resolution: "@opentelemetry/resources@npm:1.7.0"
"@opentelemetry/resources@npm:1.9.1":
version: 1.9.1
resolution: "@opentelemetry/resources@npm:1.9.1"
dependencies:
"@opentelemetry/core": 1.7.0
"@opentelemetry/semantic-conventions": 1.7.0
"@opentelemetry/core": 1.9.1
"@opentelemetry/semantic-conventions": 1.9.1
peerDependencies:
"@opentelemetry/api": ">=1.0.0 <1.3.0"
checksum: 9d669e4170120ef240757f9d82b5ef411335606114d19bd9f7a534a8328638871de0a06487f5da2dc0eb2ea540bb3ccbeea2f41c75a27de4e13e270452dd38eb
"@opentelemetry/api": ">=1.0.0 <1.5.0"
checksum: cf15e5faa698df3f0abcee35f7b4271c019b6cb81cb521b07793fe622c716d9c6873216219879afd57a28202f748a839ecaf28e04268e490004f14bbb850c96e
languageName: node
linkType: hard
@@ -7802,17 +7800,16 @@ __metadata:
languageName: node
linkType: hard
"@opentelemetry/sdk-metrics@npm:0.33.0":
version: 0.33.0
resolution: "@opentelemetry/sdk-metrics@npm:0.33.0"
"@opentelemetry/sdk-metrics@npm:1.9.1":
version: 1.9.1
resolution: "@opentelemetry/sdk-metrics@npm:1.9.1"
dependencies:
"@opentelemetry/api-metrics": 0.33.0
"@opentelemetry/core": 1.7.0
"@opentelemetry/resources": 1.7.0
"@opentelemetry/core": 1.9.1
"@opentelemetry/resources": 1.9.1
lodash.merge: 4.6.2
peerDependencies:
"@opentelemetry/api": ^1.0.0
checksum: 2c99c7ece4e545a3da0280e8dc9699458fdbb5c2bf9bcf09a9524612a844b28516d864ab1e0b5bedd12f9cccfc5d4f01663686538e8144b4d0185d2f8a581f0e
"@opentelemetry/api": ">=1.3.0 <1.5.0"
checksum: 08e8215841da74ffc36f2e5c414ab4230e5a2676a4329f9c98fbde4b162b6166612ab48bcc701cebf8ded3e2b5a68981f72987751df4393e0839089fa0c5ee13
languageName: node
linkType: hard
@@ -7830,16 +7827,16 @@ __metadata:
languageName: node
linkType: hard
"@opentelemetry/sdk-trace-base@npm:1.7.0":
version: 1.7.0
resolution: "@opentelemetry/sdk-trace-base@npm:1.7.0"
"@opentelemetry/sdk-trace-base@npm:1.9.1":
version: 1.9.1
resolution: "@opentelemetry/sdk-trace-base@npm:1.9.1"
dependencies:
"@opentelemetry/core": 1.7.0
"@opentelemetry/resources": 1.7.0
"@opentelemetry/semantic-conventions": 1.7.0
"@opentelemetry/core": 1.9.1
"@opentelemetry/resources": 1.9.1
"@opentelemetry/semantic-conventions": 1.9.1
peerDependencies:
"@opentelemetry/api": ">=1.0.0 <1.3.0"
checksum: f6ebfe1614d481ab11f4ebca4ae45ae92790e9b27a6b30cdeedf968918ac85e6d5cd695dd26ba3d0db0e665830a9c73ed25b4bd286c019c4adf084a05776bb9c
"@opentelemetry/api": ">=1.0.0 <1.5.0"
checksum: f9448132686b1a8c1fde7539845a2b31bcb315c3bbabccb20a18142db80eeed433b3713e2761151348c1b626ad00183f4b7e9b9868d1a8ab8c541dce1d082f38
languageName: node
linkType: hard
@@ -7850,13 +7847,6 @@ __metadata:
languageName: node
linkType: hard
"@opentelemetry/semantic-conventions@npm:1.7.0":
version: 1.7.0
resolution: "@opentelemetry/semantic-conventions@npm:1.7.0"
checksum: 5214501648a002cc92fc6ad2296be8fa95b1803b360fc7732222e74a7f3743f3f72952740bed18ea9207741e450f3a32bf11752d732dc83f8770681eb8a6656b
languageName: node
linkType: hard
"@opentelemetry/semantic-conventions@npm:1.8.0":
version: 1.8.0
resolution: "@opentelemetry/semantic-conventions@npm:1.8.0"
@@ -7864,6 +7854,13 @@ __metadata:
languageName: node
linkType: hard
"@opentelemetry/semantic-conventions@npm:1.9.1":
version: 1.9.1
resolution: "@opentelemetry/semantic-conventions@npm:1.9.1"
checksum: 6217ba14b8f0068a3400f054c1f9d918b2e22d1cf8d31112baa712b8d196e207aed7421c6df37ed1403f7109f51c7834c230cbe180313eee07db6f7e0a7797bc
languageName: node
linkType: hard
"@parcel/watcher@npm:2.0.4":
version: 2.0.4
resolution: "@parcel/watcher@npm:2.0.4"
@@ -22007,8 +22004,8 @@ __metadata:
"@grafana/eslint-config": 5.1.0
"@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules"
"@grafana/experimental": 1.1.0
"@grafana/faro-core": 1.0.0-beta2
"@grafana/faro-web-sdk": 1.0.0-beta2
"@grafana/faro-core": 1.0.2
"@grafana/faro-web-sdk": 1.0.2
"@grafana/google-sdk": 0.0.4
"@grafana/lezer-logql": 0.1.1
"@grafana/monaco-logql": ^0.0.6
@@ -38928,10 +38925,10 @@ __metadata:
languageName: node
linkType: hard
"web-vitals@npm:^3.0.4":
version: 3.0.4
resolution: "web-vitals@npm:3.0.4"
checksum: b618a8e049e0c64948eea09c372db490802bcc8bcb30230a2bc69d9e243b1a2fa54d0f0ae19d5e63f19381df86db2a9260ca15ef620e10024888eab487a77d56
"web-vitals@npm:^3.1.1":
version: 3.3.0
resolution: "web-vitals@npm:3.3.0"
checksum: 925a912ec3e0d11fe19687b13abb8fc9d6054433f8ee4636fd4c03de3744264cea448e2c36a20fe82bc5979c796cf0ed20668f2b92beef8e134b195e38c231f8
languageName: node
linkType: hard