[v7] Allow for passing scope internally during client creation

kamilogorek · kamilogorek · commit 11de1adf64ca · 2021-03-29T12:13:38.000+02:00
diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts
@@ -62,7 +62,6 @@ import { collectIntegrations } from './integrations';
  *   // ...
  * }
  */
-// TODO: Allow for passing scope during construction for explicit `this._scope`
 export abstract class BaseClient<O extends Options> implements ClientLike<O> {
   /** Options passed to the SDK. */
   public readonly options: O;
@@ -79,7 +78,7 @@ export abstract class BaseClient<O extends Options> implements ClientLike<O> {
 
   protected _lastEventId?: string;
 
-  protected _scope: ScopeLike = new Scope();
+  protected _scope: ScopeLike;
 
   protected _eventProcessors: EventProcessor[] = [];
 
@@ -101,6 +100,7 @@ export abstract class BaseClient<O extends Options> implements ClientLike<O> {
       this.logger.enabled = true;
     }
 
+    this._scope = this.options._internal?.scope || new Scope();
     this._transport = this._setupTransport();
     this._integrations = this._setupIntegrations();
   }
diff --git a/packages/integration-common-inboundfilters/src/index.ts b/packages/integration-common-inboundfilters/src/index.ts
@@ -94,9 +94,9 @@ export class InboundFilters implements Integration {
       return false;
     }
 
+    const { ignoreErrors } = options;
     return this._getPossibleEventMessages(event).some(message =>
-      // Not sure why TypeScript complains here...
-      (options.ignoreErrors as Array<RegExp | string>).some(pattern => isMatchingPattern(message, pattern)),
+      ignoreErrors.some(pattern => isMatchingPattern(message, pattern)),
     );
   }
 
diff --git a/packages/types/src/options.ts b/packages/types/src/options.ts
@@ -2,6 +2,7 @@ import { Breadcrumb, BreadcrumbHint } from './breadcrumb';
 import { SentryEvent, EventHint } from './event';
 import { Integration } from './integration';
 import { LogLevel } from './loglevel';
+import { ScopeLike } from './scope';
 import { SdkInfo } from './sdkinfo';
 import { SamplingContext } from './transaction';
 import { Transport, TransportOptions } from './transport';
@@ -130,6 +131,7 @@ export interface Options {
 
   _internal?: {
     sdk?: SdkInfo;
+    scope?: ScopeLike;
     defaultIntegrations?: Integration[];
     discoveredIntegrations?: Integration[];
   };

Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,9 @@ export class InboundFilters implements Integration {`
`94`	`94`	`return false;`
`95`	`95`	`}`
`96`	`96`
	`97`	`+ const { ignoreErrors } = options;`
`97`	`98`	`return this._getPossibleEventMessages(event).some(message =>`
`98`		`- // Not sure why TypeScript complains here...`
`99`		`- (options.ignoreErrors as Array<RegExp \| string>).some(pattern => isMatchingPattern(message, pattern)),`
	`99`	`+ ignoreErrors.some(pattern => isMatchingPattern(message, pattern)),`
`100`	`100`	`);`
`101`	`101`	`}`
`102`	`102`