Normalize free form data in spans

Author: Luca Forstner

packages/core/src/baseclient.ts

@@ -477,7 +477,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
       return null;
     }
 
-    const normalized = {
+    const normalized: Event = {
       ...event,
       ...(event.breadcrumbs && {
         breadcrumbs: event.breadcrumbs.map(b => ({
@@ -497,6 +497,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
         extra: normalize(event.extra, depth, maxBreadth),
       }),
     };
+
     // event.contexts.trace stores information about a Transaction. Similarly,
     // event.spans[] stores information about child Spans. Given that a
     // Transaction is conceptually a Span, normalization should apply to both
@@ -505,16 +506,24 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
     // so this block overwrites the normalized event to add back the original
     // Transaction information prior to normalization.
     if (event.contexts && event.contexts.trace) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      normalized.contexts = {};
       normalized.contexts.trace = event.contexts.trace;
 
       // event.contexts.trace.data may contain circular/dangerous data so we need to normalize it
       if (event.contexts.trace.data) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         normalized.contexts.trace.data = normalize(event.contexts.trace.data, depth, maxBreadth);
       }
     }
 
+    // event.spans[].data may contain circular/dangerous data so we need to normalize it
+    if (event.spans) {
+      normalized.spans = event.spans.map(span => {
+        // We cannot use the spread operator on span here because that overwrites the `toJSON` method
+        span.data = normalize(span.data, depth, maxBreadth);
+        return span;
+      });
+    }
+
     normalized.sdkProcessingMetadata = { ...normalized.sdkProcessingMetadata, baseClientNormalized: true };
 
     return normalized;