refactor: ♻️ pass spanContextStorage to plugin lambda

Author: gingerbenw

packages/core/lib/core.ts

@@ -30,7 +30,7 @@ export interface ClientOptions<S extends CoreSchema, C extends Configuration> {
   resourceAttributesSource: ResourceAttributeSource<C>
   spanAttributesSource: SpanAttributesSource
   schema: S
-  plugins: (spanFactory: SpanFactory) => Array<Plugin<C>>
+  plugins: (spanFactory: SpanFactory, spanContextStorage: SpanContextStorage) => Array<Plugin<C>>
   persistence: Persistence
   spanContextStorage?: SpanContextStorage
 }
@@ -51,7 +51,7 @@ export function createClient<S extends CoreSchema, C extends Configuration> (opt
     options.schema.logger.defaultValue,
     spanContextStorage
   )
-  const plugins = options.plugins(spanFactory)
+  const plugins = options.plugins(spanFactory, spanContextStorage)
 
   return {
     start: (config: C | string) => {

packages/core/lib/span-factory.ts

@@ -51,10 +51,6 @@ export class SpanFactory {
     this.openSpans = new WeakSet<SpanInternal>()
   }
 
-  get firstSpanContext () {
-    return this.spanContextStorage.first
-  }
-
   startSpan (name: string, options: SpanOptions = {}) {
     const safeStartTime = timeToNumber(this.clock, options ? options.startTime : undefined)
     const spanId = this.idGenerator.generate(64)

packages/platforms/browser/lib/auto-instrumentation/resource-load-plugin.ts

@@ -1,4 +1,4 @@
-import { type InternalConfiguration, type Plugin, type SpanFactory } from '@bugsnag/core-performance'
+import { type SpanContextStorage, type InternalConfiguration, type Plugin, type SpanFactory } from '@bugsnag/core-performance'
 import { type BrowserConfiguration } from '../config'
 
 interface ResourceTiming extends PerformanceResourceTiming {
@@ -34,6 +34,7 @@ function resourceLoadSupported (PerformanceObserverClass: typeof PerformanceObse
 export class ResourceLoadPlugin implements Plugin<BrowserConfiguration> {
   constructor (
     private readonly spanFactory: SpanFactory,
+    private readonly spanContextStorage: SpanContextStorage,
     private readonly PerformanceObserverClass: typeof PerformanceObserver
   ) {}
 
@@ -48,7 +49,7 @@ export class ResourceLoadPlugin implements Plugin<BrowserConfiguration> {
          continue
        }
 
-        const parentContext = this.spanFactory.firstSpanContext
+        const parentContext = this.spanContextStorage.first
 
         if (parentContext) {
           const url = new URL(entry.name)

packages/platforms/browser/lib/browser.ts

@@ -39,7 +39,7 @@ const BugsnagPerformance = createClient({
   deliveryFactory: createBrowserDeliveryFactory(window.fetch, backgroundingListener),
   idGenerator,
   schema: createSchema(window.location.hostname, new DefaultRoutingProvider()),
-  plugins: (spanFactory) => [
+  plugins: (spanFactory, spanContextStorage) => [
     onSettle,
     new FullPageLoadPlugin(
       document,
@@ -52,7 +52,7 @@ const BugsnagPerformance = createClient({
     ),
     new NetworkRequestPlugin(spanFactory, fetchRequestTracker, xhrRequestTracker),
     new RouteChangePlugin(spanFactory, window.location),
-    new ResourceLoadPlugin(spanFactory, window.PerformanceObserver)
+    new ResourceLoadPlugin(spanFactory, spanContextStorage, window.PerformanceObserver)
   ],
   persistence
 })

packages/platforms/browser/tests/auto-instrumentation/resource-load-plugin.test.ts

@@ -19,8 +19,8 @@ describe('ResourceLoadPlugin', () => {
     const client = createTestClient({
       idGenerator,
       deliveryFactory: () => delivery,
-      plugins: (spanFactory) => [
-        new ResourceLoadPlugin(spanFactory, Observer)
+      plugins: (spanFactory, spanContextStorage) => [
+        new ResourceLoadPlugin(spanFactory, spanContextStorage, Observer)
       ]
     })
 
@@ -68,8 +68,8 @@ describe('ResourceLoadPlugin', () => {
     const client = createTestClient({
       idGenerator,
       deliveryFactory: () => delivery,
-      plugins: (spanFactory) => [
-        new ResourceLoadPlugin(spanFactory, Observer)
+      plugins: (spanFactory, spanContextStorage) => [
+        new ResourceLoadPlugin(spanFactory, spanContextStorage, Observer)
       ]
     })
 
@@ -108,8 +108,8 @@ describe('ResourceLoadPlugin', () => {
     const client = createTestClient({
       idGenerator,
       deliveryFactory: () => delivery,
-      plugins: (spanFactory) => [
-        new ResourceLoadPlugin(spanFactory, Observer)
+      plugins: (spanFactory, spanContextStorage) => [
+        new ResourceLoadPlugin(spanFactory, spanContextStorage, Observer)
       ]
     })