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 59b0a130f4c..ca7d940b2fc 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 @@ -92,7 +92,7 @@ describe('GrafanaJavascriptAgentEchoBackend', () => { expect(initializeFaroMock.mock.calls[0][0].transports?.length).toEqual(2); expect(initializeFaroMock.mock.calls[0][0].transports?.[0]).toBeInstanceOf(EchoSrvTransport); expect(initializeFaroMock.mock.calls[0][0].transports?.[0].getIgnoreUrls()).toEqual([ - new RegExp('/*/log-grafana-javascript-agent/'), + /.*\/log-grafana-javascript-agent.*/, /.*.google-analytics.com*.*/, /.*.googletagmanager.com*.*/, /frontend-metrics/, 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 f9659d6a168..4ea54e38053 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 @@ -1,4 +1,4 @@ -import { BuildInfo } from '@grafana/data'; +import { BuildInfo, escapeRegex } from '@grafana/data'; import { BaseTransport, defaultInternalLoggerLevel } from '@grafana/faro-core'; import { initializeFaro, @@ -53,7 +53,12 @@ export class GrafanaJavascriptAgentBackend constructor(public options: GrafanaJavascriptAgentBackendOptions) { // configure instrumentations. const instrumentations: Instrumentation[] = []; - const ignoreUrls = [new RegExp(`/*${options.customEndpoint}/`), ...TRACKING_URLS, ...options.ignoreUrls]; + + const ignoreUrls = [ + new RegExp(`.*${escapeRegex(options.customEndpoint)}.*`), + ...TRACKING_URLS, + ...options.ignoreUrls, + ]; const transports: BaseTransport[] = [new EchoSrvTransport({ ignoreUrls })];