mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Update dependency @grafana/faro-core to v1.1.0 (#69834)
* Update dependency @grafana/faro-core to v1.1.0 * dedupe * update faro-web-sdk as well --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
This commit is contained in:
parent
d61af3adde
commit
380843de36
@ -255,8 +255,8 @@
|
||||
"@grafana/data": "workspace:*",
|
||||
"@grafana/e2e-selectors": "workspace:*",
|
||||
"@grafana/experimental": "1.4.2",
|
||||
"@grafana/faro-core": "1.0.2",
|
||||
"@grafana/faro-web-sdk": "1.0.2",
|
||||
"@grafana/faro-core": "1.1.0",
|
||||
"@grafana/faro-web-sdk": "1.1.0",
|
||||
"@grafana/google-sdk": "0.1.1",
|
||||
"@grafana/lezer-logql": "0.1.5",
|
||||
"@grafana/monaco-logql": "^0.0.7",
|
||||
|
@ -39,7 +39,7 @@
|
||||
"dependencies": {
|
||||
"@grafana/data": "10.1.0-pre",
|
||||
"@grafana/e2e-selectors": "10.1.0-pre",
|
||||
"@grafana/faro-web-sdk": "1.0.2",
|
||||
"@grafana/faro-web-sdk": "1.1.0",
|
||||
"@grafana/ui": "10.1.0-pre",
|
||||
"history": "4.10.1",
|
||||
"lodash": "4.17.21",
|
||||
|
@ -1,16 +1,14 @@
|
||||
import { faro, LogLevel } from '@grafana/faro-web-sdk';
|
||||
import { faro, LogLevel, LogContext } from '@grafana/faro-web-sdk';
|
||||
|
||||
import { config } from '../config';
|
||||
|
||||
export { LogLevel };
|
||||
|
||||
type Contexts = Record<string, Record<string, number | string | Record<string, string | number>>>;
|
||||
|
||||
/**
|
||||
* Log a message at INFO level
|
||||
* @public
|
||||
*/
|
||||
export function logInfo(message: string, contexts?: Contexts) {
|
||||
export function logInfo(message: string, contexts?: LogContext) {
|
||||
if (config.grafanaJavascriptAgent.enabled) {
|
||||
faro.api.pushLog([message], {
|
||||
level: LogLevel.INFO,
|
||||
@ -24,7 +22,7 @@ export function logInfo(message: string, contexts?: Contexts) {
|
||||
*
|
||||
* @public
|
||||
*/
|
||||
export function logWarning(message: string, contexts?: Contexts) {
|
||||
export function logWarning(message: string, contexts?: LogContext) {
|
||||
if (config.grafanaJavascriptAgent.enabled) {
|
||||
faro.api.pushLog([message], {
|
||||
level: LogLevel.WARN,
|
||||
@ -38,7 +36,7 @@ export function logWarning(message: string, contexts?: Contexts) {
|
||||
*
|
||||
* @public
|
||||
*/
|
||||
export function logDebug(message: string, contexts?: Contexts) {
|
||||
export function logDebug(message: string, contexts?: LogContext) {
|
||||
if (config.grafanaJavascriptAgent.enabled) {
|
||||
faro.api.pushLog([message], {
|
||||
level: LogLevel.DEBUG,
|
||||
@ -52,7 +50,7 @@ export function logDebug(message: string, contexts?: Contexts) {
|
||||
*
|
||||
* @public
|
||||
*/
|
||||
export function logError(err: Error, contexts?: Contexts) {
|
||||
export function logError(err: Error, contexts?: LogContext) {
|
||||
if (config.grafanaJavascriptAgent.enabled) {
|
||||
faro.api.pushError(err);
|
||||
}
|
||||
|
@ -51,7 +51,7 @@
|
||||
"@emotion/react": "11.10.6",
|
||||
"@grafana/data": "10.1.0-pre",
|
||||
"@grafana/e2e-selectors": "10.1.0-pre",
|
||||
"@grafana/faro-web-sdk": "1.0.2",
|
||||
"@grafana/faro-web-sdk": "1.1.0",
|
||||
"@grafana/schema": "10.1.0-pre",
|
||||
"@leeoniya/ufuzzy": "1.0.6",
|
||||
"@monaco-editor/react": "4.5.1",
|
||||
|
125
yarn.lock
125
yarn.lock
@ -3759,25 +3759,26 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@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"
|
||||
"@grafana/faro-core@npm:1.1.0, @grafana/faro-core@npm:^1.1.0":
|
||||
version: 1.1.0
|
||||
resolution: "@grafana/faro-core@npm:1.1.0"
|
||||
dependencies:
|
||||
"@opentelemetry/api": ^1.4.0
|
||||
"@opentelemetry/api": ^1.4.1
|
||||
"@opentelemetry/api-metrics": ^0.33.0
|
||||
"@opentelemetry/otlp-transformer": ^0.35.0
|
||||
checksum: 09c3c6687b955aacd17de73dca319dbb2abda8dd26f5c038618266ffefbc1f915cfe12167cd4b49db5c639ab70b7141bb9794c3cbdc682bb63174f95df9d9dfd
|
||||
"@opentelemetry/otlp-transformer": ^0.37.0
|
||||
murmurhash-js: ^1.0.0
|
||||
checksum: 1e8504f3cab4ead385347002e265e6e7b32900704fa10dfe19ee72fe5bc50c9acb2fc6fc46f8e7d8efdc796fac9d06ba6d1b5a6512b47f09928c52df2a5fc3dd
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@grafana/faro-web-sdk@npm:1.0.2":
|
||||
version: 1.0.2
|
||||
resolution: "@grafana/faro-web-sdk@npm:1.0.2"
|
||||
"@grafana/faro-web-sdk@npm:1.1.0":
|
||||
version: 1.1.0
|
||||
resolution: "@grafana/faro-web-sdk@npm:1.1.0"
|
||||
dependencies:
|
||||
"@grafana/faro-core": ^1.0.2
|
||||
"@grafana/faro-core": ^1.1.0
|
||||
ua-parser-js: ^1.0.32
|
||||
web-vitals: ^3.1.1
|
||||
checksum: ca04add8469778d73e1bc15f057d063d93a88b9d76325c79060848ad3211fa929e30b6a85365981f7bcef023704f9f92f67678311bfed13dd521399c0f00e92f
|
||||
checksum: e4fad2ff3c7d2d3cbc9e485e05a078a4ec0bc216907ed05361f91071611b7ce4256ba9cc8bbf6b23068efd02d32dfd42cfcd5d8a2b868c8ba006db27cd71c2a7
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -3817,7 +3818,7 @@ __metadata:
|
||||
dependencies:
|
||||
"@grafana/data": 10.1.0-pre
|
||||
"@grafana/e2e-selectors": 10.1.0-pre
|
||||
"@grafana/faro-web-sdk": 1.0.2
|
||||
"@grafana/faro-web-sdk": 1.1.0
|
||||
"@grafana/tsconfig": ^1.2.0-rc1
|
||||
"@grafana/ui": 10.1.0-pre
|
||||
"@rollup/plugin-commonjs": 23.0.2
|
||||
@ -3920,7 +3921,7 @@ __metadata:
|
||||
"@emotion/react": 11.10.6
|
||||
"@grafana/data": 10.1.0-pre
|
||||
"@grafana/e2e-selectors": 10.1.0-pre
|
||||
"@grafana/faro-web-sdk": 1.0.2
|
||||
"@grafana/faro-web-sdk": 1.1.0
|
||||
"@grafana/schema": 10.1.0-pre
|
||||
"@grafana/tsconfig": ^1.2.0-rc1
|
||||
"@leeoniya/ufuzzy": 1.0.6
|
||||
@ -6112,7 +6113,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@opentelemetry/api@npm:1.4.0, @opentelemetry/api@npm:^1.4.0":
|
||||
"@opentelemetry/api@npm:1.4.0":
|
||||
version: 1.4.0
|
||||
resolution: "@opentelemetry/api@npm:1.4.0"
|
||||
checksum: 8dc522194e20d2e8aa6cac155dbce19d3fc9cfac59e953ece1064158c6348ccd9560ee99d2f2381e82c2f8c9a129b57fa7b640027383315504de1fa712b6d7f1
|
||||
@ -6126,6 +6127,13 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@opentelemetry/api@npm:^1.4.1":
|
||||
version: 1.4.1
|
||||
resolution: "@opentelemetry/api@npm:1.4.1"
|
||||
checksum: e783c40d1a518abf9c4c5d65223237c1392cd9a6c53ac6e2c3ef0c05ff7266e3dfc4fd9874316dae0dcb7a97950878deb513bcbadfaad653d48f0215f2a0911b
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@opentelemetry/core@npm:0.25.0":
|
||||
version: 0.25.0
|
||||
resolution: "@opentelemetry/core@npm:0.25.0"
|
||||
@ -6138,14 +6146,14 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@opentelemetry/core@npm:1.9.1":
|
||||
version: 1.9.1
|
||||
resolution: "@opentelemetry/core@npm:1.9.1"
|
||||
"@opentelemetry/core@npm:1.11.0":
|
||||
version: 1.11.0
|
||||
resolution: "@opentelemetry/core@npm:1.11.0"
|
||||
dependencies:
|
||||
"@opentelemetry/semantic-conventions": 1.9.1
|
||||
"@opentelemetry/semantic-conventions": 1.11.0
|
||||
peerDependencies:
|
||||
"@opentelemetry/api": ">=1.0.0 <1.5.0"
|
||||
checksum: 5581a809e2caff142136734634f45255ce9f1ed701cf38629b9e17d91a8d15449b467fb3a7f3d0d8b076f653090e50cc31d3b1db4cfefeda9b6b901c60581024
|
||||
checksum: 866e4a85dde90d228e1822fc7238953d7353ddc1528c2936253a1c8dd47b260fe45551d9172cf97b6e34d851ee5204b391ebc66ab244e1994ac6d816e790c78e
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -6164,17 +6172,17 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@opentelemetry/otlp-transformer@npm:^0.35.0":
|
||||
version: 0.35.1
|
||||
resolution: "@opentelemetry/otlp-transformer@npm:0.35.1"
|
||||
"@opentelemetry/otlp-transformer@npm:^0.37.0":
|
||||
version: 0.37.0
|
||||
resolution: "@opentelemetry/otlp-transformer@npm:0.37.0"
|
||||
dependencies:
|
||||
"@opentelemetry/core": 1.9.1
|
||||
"@opentelemetry/resources": 1.9.1
|
||||
"@opentelemetry/sdk-metrics": 1.9.1
|
||||
"@opentelemetry/sdk-trace-base": 1.9.1
|
||||
"@opentelemetry/core": 1.11.0
|
||||
"@opentelemetry/resources": 1.11.0
|
||||
"@opentelemetry/sdk-metrics": 1.11.0
|
||||
"@opentelemetry/sdk-trace-base": 1.11.0
|
||||
peerDependencies:
|
||||
"@opentelemetry/api": ">=1.3.0 <1.5.0"
|
||||
checksum: e0a68b2be28d5535aaaa58be31a5e85b268b42025c8b3a34498f00b019fbd172530b1b484c4257fd330c5890007130eedec288b8fe8f2b85176198f9ffc2507e
|
||||
checksum: 353a0f29d27a6b969d1458de7d829da06866bce58e9e24a9ae98d463056fecc1120a88660a9e1a72643e4a3e9de0fd731e54ded02c7abb99118cf7992229234d
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -6190,15 +6198,15 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@opentelemetry/resources@npm:1.9.1":
|
||||
version: 1.9.1
|
||||
resolution: "@opentelemetry/resources@npm:1.9.1"
|
||||
"@opentelemetry/resources@npm:1.11.0":
|
||||
version: 1.11.0
|
||||
resolution: "@opentelemetry/resources@npm:1.11.0"
|
||||
dependencies:
|
||||
"@opentelemetry/core": 1.9.1
|
||||
"@opentelemetry/semantic-conventions": 1.9.1
|
||||
"@opentelemetry/core": 1.11.0
|
||||
"@opentelemetry/semantic-conventions": 1.11.0
|
||||
peerDependencies:
|
||||
"@opentelemetry/api": ">=1.0.0 <1.5.0"
|
||||
checksum: cf15e5faa698df3f0abcee35f7b4271c019b6cb81cb521b07793fe622c716d9c6873216219879afd57a28202f748a839ecaf28e04268e490004f14bbb850c96e
|
||||
checksum: 3d4577d06f166d7efcf33ecc909115502d30cdf6bc53536c1672a8e76071447f3a01b2546159c7f44440c83549807e1d546ff1a0d4c169c8368013ed1d7d75f5
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -6216,16 +6224,16 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@opentelemetry/sdk-metrics@npm:1.9.1":
|
||||
version: 1.9.1
|
||||
resolution: "@opentelemetry/sdk-metrics@npm:1.9.1"
|
||||
"@opentelemetry/sdk-metrics@npm:1.11.0":
|
||||
version: 1.11.0
|
||||
resolution: "@opentelemetry/sdk-metrics@npm:1.11.0"
|
||||
dependencies:
|
||||
"@opentelemetry/core": 1.9.1
|
||||
"@opentelemetry/resources": 1.9.1
|
||||
"@opentelemetry/core": 1.11.0
|
||||
"@opentelemetry/resources": 1.11.0
|
||||
lodash.merge: 4.6.2
|
||||
peerDependencies:
|
||||
"@opentelemetry/api": ">=1.3.0 <1.5.0"
|
||||
checksum: 08e8215841da74ffc36f2e5c414ab4230e5a2676a4329f9c98fbde4b162b6166612ab48bcc701cebf8ded3e2b5a68981f72987751df4393e0839089fa0c5ee13
|
||||
checksum: 158ebcb79fc08f7e1530dcd2f0bfb9afbe2668396721df98fc7a7f5a75ceed4bceb7102aae0efcc24cd9bd5c92b51aa55a86f2cc904b538a45641ca0315b2e06
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -6243,16 +6251,16 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@opentelemetry/sdk-trace-base@npm:1.9.1":
|
||||
version: 1.9.1
|
||||
resolution: "@opentelemetry/sdk-trace-base@npm:1.9.1"
|
||||
"@opentelemetry/sdk-trace-base@npm:1.11.0":
|
||||
version: 1.11.0
|
||||
resolution: "@opentelemetry/sdk-trace-base@npm:1.11.0"
|
||||
dependencies:
|
||||
"@opentelemetry/core": 1.9.1
|
||||
"@opentelemetry/resources": 1.9.1
|
||||
"@opentelemetry/semantic-conventions": 1.9.1
|
||||
"@opentelemetry/core": 1.11.0
|
||||
"@opentelemetry/resources": 1.11.0
|
||||
"@opentelemetry/semantic-conventions": 1.11.0
|
||||
peerDependencies:
|
||||
"@opentelemetry/api": ">=1.0.0 <1.5.0"
|
||||
checksum: f9448132686b1a8c1fde7539845a2b31bcb315c3bbabccb20a18142db80eeed433b3713e2761151348c1b626ad00183f4b7e9b9868d1a8ab8c541dce1d082f38
|
||||
checksum: 64f00f8ede6f9fe5749021b820c412a78d984883dbe7db0ab2ed24fb3e2db0bcb9b928361cccb839b8a89007391fac0ad18386140394cc165716299b9b3b37e9
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -6263,6 +6271,13 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@opentelemetry/semantic-conventions@npm:1.11.0":
|
||||
version: 1.11.0
|
||||
resolution: "@opentelemetry/semantic-conventions@npm:1.11.0"
|
||||
checksum: 310f2aad2a958b02ea2e661251e202989c662306e85a1c27bc99dec9c4d42fce5fc9b34bf21169276798acdae9d52af3b7ec19d8e5e9bb420fc145d0b901823c
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@opentelemetry/semantic-conventions@npm:1.14.0":
|
||||
version: 1.14.0
|
||||
resolution: "@opentelemetry/semantic-conventions@npm:1.14.0"
|
||||
@ -6270,13 +6285,6 @@ __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"
|
||||
@ -18575,8 +18583,8 @@ __metadata:
|
||||
"@grafana/eslint-config": 5.1.0
|
||||
"@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules"
|
||||
"@grafana/experimental": 1.4.2
|
||||
"@grafana/faro-core": 1.0.2
|
||||
"@grafana/faro-web-sdk": 1.0.2
|
||||
"@grafana/faro-core": 1.1.0
|
||||
"@grafana/faro-web-sdk": 1.1.0
|
||||
"@grafana/google-sdk": 0.1.1
|
||||
"@grafana/lezer-logql": 0.1.5
|
||||
"@grafana/monaco-logql": ^0.0.7
|
||||
@ -23470,6 +23478,13 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"murmurhash-js@npm:^1.0.0":
|
||||
version: 1.0.0
|
||||
resolution: "murmurhash-js@npm:1.0.0"
|
||||
checksum: 083cea92a11bc9eb25be1446fc92eded3f49731bc1ad34fa8023afd68c234d1dd59458d70eb20e667b1383bedeeb8dfb1a16c89913b6ffe3584fd22fb598739d
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"mutationobserver-shim@npm:0.3.7":
|
||||
version: 0.3.7
|
||||
resolution: "mutationobserver-shim@npm:0.3.7"
|
||||
|
Loading…
Reference in New Issue
Block a user