fixes after rebase

grafana · Jun 2, 2022 · 161682f · 161682f
1 parent abfe1c4
commit 161682f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/demo/src/index.ts b/demo/src/index.ts
@@ -1,10 +1,10 @@
 import { TracingInstrumentation } from '@grafana/agent-tracing-web';
-import { ConsoleInstrumentation, initializeAgent, getWebInstrumentations } from '@grafana/agent-web';
+import { initializeAgent, getWebInstrumentations } from '@grafana/agent-web';
 
 const agent = initializeAgent({
   url: 'http://localhost:12345/collect',
   apiKey: 'secret',
-  instrumentations: [...getWebInstrumentations(), new TracingInstrumentation(), new ConsoleInstrumentation()],
+  instrumentations: [...getWebInstrumentations(), new TracingInstrumentation()],
   app: {
     name: 'frontend',
     version: '1.0.0',

diff --git a/packages/core/src/config/index.ts b/packages/core/src/config/index.ts
@@ -1,3 +1,3 @@
 export { defaultGlobalObjectKey } from './const';
 
-export type { Config } from './types';
+export type { Config, Patterns } from './types';
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -18,7 +18,7 @@ export { initializeAgent } from './initialize';
 
 export type { Agent } from './types';
 
-export type { Config } from './config';
+export type { Config, Patterns } from './config';
 export { defaultGlobalObjectKey } from './config';
 
 export type { Instrumentation } from './instrumentations';

diff --git a/packages/tracing-web/src/instrumentation.ts b/packages/tracing-web/src/instrumentation.ts
@@ -82,6 +82,6 @@ export class TracingInstrumentation extends BaseInstrumentation {
   }
 
   private getIgnoreUrls(): Array<string | RegExp> {
-    return this.agent.transports.value.flatMap((transport) => transport.getIgnoreUrls());
+    return this.agent.transports.transports.flatMap((transport) => transport.getIgnoreUrls());
   }
 }
diff --git a/packages/web/src/config.ts b/packages/web/src/config.ts
@@ -7,9 +7,10 @@ import {
   Config,
   defaultGlobalObjectKey,
   Transport,
+  Patterns,
 } from '@grafana/agent-core';
 
-import { ErrorsInstrumentation, WebVitalsInstrumentation } from './instrumentations';
+import { ConsoleInstrumentation, ErrorsInstrumentation, WebVitalsInstrumentation } from './instrumentations';
 import { browserMeta, pageMeta } from './metas';
 import { FetchTransport } from './transports';
 
@@ -24,14 +25,28 @@ export interface BrowserConfig {
   metas?: MetaItem[];
   instrumentations?: Instrumentation[];
   transports?: Transport[];
+  ignoreErrors?: Patterns;
 }
 
 export const defaultMetas: MetaItem[] = [browserMeta, pageMeta];
 
-export const getDefaultInstrumentations = (): Instrumentation[] => [
-  new ErrorsInstrumentation(),
-  new WebVitalsInstrumentation(),
-];
+interface GetWebInstrumentationsOptions {
+  captureConsole?: boolean
+}
+
+export const getWebInstrumentations = (options: GetWebInstrumentationsOptions = {}): Instrumentation[] => {
+
+  const instrumentations: Instrumentation[] = [
+    new ErrorsInstrumentation(),
+    new WebVitalsInstrumentation(),
+  ];
+
+  if (options.captureConsole !== false) {
+    instrumentations.push(new ConsoleInstrumentation())
+  }
+
+  return instrumentations;
+}
 
 export function makeCoreConfig(browserConfig: BrowserConfig): Config {
   const transports: Transport[] = [];
@@ -56,10 +71,11 @@ export function makeCoreConfig(browserConfig: BrowserConfig): Config {
     preventGlobalExposure: browserConfig.preventGlobalExposure || false,
     transports,
     metas: browserConfig.metas ?? defaultMetas,
-    instrumentations: browserConfig.instrumentations ?? getDefaultInstrumentations(),
+    instrumentations: browserConfig.instrumentations ?? getWebInstrumentations(),
     app: browserConfig.app,
     session: browserConfig.session,
     user: browserConfig.user,
+    ignoreErrors: browserConfig.ignoreErrors
   };
 
   return config;