fix: additions from lotus integration, sess 1

Author: xnanodax

src/v3/hooks.ts

@@ -34,10 +34,7 @@ export const generateUseBeacon =
       const renderCountRef = useRef(0)
       renderCountRef.current += 1
 
-      const attributes = {
-        ...config.attributes,
-        renderCount: renderCountRef.current,
-      }
+      const { attributes } = config
 
       const status = config.error ? 'error' : 'ok'
 
@@ -47,6 +44,7 @@ export const generateUseBeacon =
         duration: 0,
         attributes,
         status,
+        renderCount: renderCountRef.current,
       })
 
       traceManager.processSpan(renderStartTaskEntry)
@@ -60,6 +58,7 @@ export const generateUseBeacon =
             duration: performance.now() - renderStartTaskEntry.startTime.now,
             status,
             attributes,
+            renderCount: renderCountRef.current,
           }),
         )
       })
@@ -75,6 +74,7 @@ export const generateUseBeacon =
             errorInfo: errorBoundaryMetadata?.errorInfo,
             duration: 0,
             status: errorBoundaryMetadata?.error ? 'error' : 'ok',
+            renderCount: renderCountRef.current,
           })
           traceManager.processSpan(unmountEntry)
         },

src/v3/matchSpan.ts

@@ -16,12 +16,15 @@ export type SpanMatcherFn<ScopeT extends ScopeBase> = ((
   SpanMatcherTags
 
 export interface SpanMatchDefinition<ScopeT extends ScopeBase> {
+  // IMPLEMENTATION TODO: take in scope as a second parameter
   name?: string | RegExp | ((name: string) => boolean)
+  // IMPLEMENTATION TODO: take in scope as a second parameter
   performanceEntryName?: string | RegExp | ((name: string) => boolean)
   type?: SpanType
   status?: SpanStatus
   attributes?: Attributes
   scopes?: (keyof ScopeT)[]
+  // IMPLEMENTATION TODO: take in scope as a second parameter
   occurrence?: number | ((occurrence: number) => boolean)
   isIdle?: boolean
 }

src/v3/spanTypes.ts

@@ -95,9 +95,10 @@ export interface SpanBase<ScopeT extends ScopeBase> {
 
 export interface ComponentRenderSpan<ScopeT extends ScopeBase>
   extends Omit<SpanBase<ScopeT>, 'scope' | 'attributes'>,
-    BeaconConfig<ScopeT> {
+  BeaconConfig<ScopeT> {
   type: ComponentLifecycleSpanType
   errorInfo?: ErrorInfo
+  renderCount: number
 }
 
 export type InitiatorType =
@@ -126,17 +127,22 @@ export type InitiatorType =
 
 export interface ResourceSpan<ScopeT extends ScopeBase>
   extends SpanBase<ScopeT> {
+  type: 'resource',
   resourceDetails: {
     initiatorType: InitiatorType
     query: Record<string, string | string[]>
     hash: string
   }
 }
+
+export interface PerformanceEntrySpan<ScopeT extends ScopeBase> extends SpanBase<ScopeT> {
+  type: Exclude<NativePerformanceEntryType, 'resource'>
+}
+
 /**
  * All possible trace entries
  */
-
 export type Span<ScopeT extends ScopeBase> =
-  | SpanBase<ScopeT>
+  | PerformanceEntrySpan<ScopeT>
   | ComponentRenderSpan<ScopeT>
   | ResourceSpan<ScopeT>

src/v3/traceManager.test.ts

@@ -591,4 +591,6 @@ describe('TraceManager', () => {
       expect(report.interruptionReason).toBe('timeout')
     })
   })
+
+  // TESTING TODO: add test cases with getQuietWindowDuration
 })

src/v3/traceManager.ts

@@ -65,6 +65,7 @@ export class TraceManager<ScopeT extends ScopeBase> {
       computedValueDefinitions,
     }
 
+    // TESTING TODO: Add tests for define computed span and define computed value
     return {
       defineComputedSpan: (definition) => {
         computedSpanDefinitions.push(definition)

src/v3/traceRecordingTypes.ts

@@ -85,6 +85,6 @@ export interface ComputedValueDefinition<
   matches: [...MatchersT]
   computeValueFromMatches: (
     // as many matches as match of type Span<ScopeT>
-    matches: MapTuple<MatchersT, SpanAndAnnotation<ScopeT>>,
+    ...matches: MapTuple<MatchersT, SpanAndAnnotation<ScopeT>[]>
   ) => number | string | boolean
 }

src/v3/types.ts

@@ -86,7 +86,7 @@ export interface TraceDefinition<ScopeT extends ScopeBase> {
    */
   name: string
 
-  type: TraceType
+  type?: TraceType
 
   // TODO: implement this with typechecking
   // to ensure we cannot start a trace without the required scope keys