use new attribute serialization for spanv2

Author: Lms24

packages/core/src/attributes.ts

@@ -6,7 +6,7 @@ export type RawAttributes<T> = T & ValidatedAttributes<T>;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type RawAttribute<T> = T extends { value: any } | { unit: any } ? AttributeObject : T;
 
-export type Attributes = Record<string, TypedAttributeValue>;
+export type TypedAttributes = Record<string, TypedAttributeValue>;
 
 export type AttributeValueType = string | number | boolean | Array<string> | Array<number> | Array<boolean>;
 

packages/core/src/spans/spanFirstUtils.ts

@@ -1,8 +1,7 @@
 import type { RawAttributes } from '../attributes';
-import { isAttributeObject } from '../attributes';
+import { attributeValueToTypedAttributeValue, isAttributeObject } from '../attributes';
 import type { Context, Contexts } from '../types-hoist/context';
 import type { SpanV2JSON } from '../types-hoist/span';
-import { attributeValueToSerializedAttribute } from '../utils/attributes';
 import { isPrimitive } from '../utils/is';
 import { showSpanDropWarning } from '../utils/spanUtils';
 
@@ -56,13 +55,13 @@ function setAttributeOnSpanJSONWithMaybeUnit(
     const { value, unit } = attributeValue;
 
     if (isSupportedSerializableType(value)) {
-      spanJSON.attributes[attributeKey] = attributeValueToSerializedAttribute(value);
+      spanJSON.attributes[attributeKey] = attributeValueToTypedAttributeValue(attributeValue);
       if (unit) {
         spanJSON.attributes[attributeKey].unit = unit;
       }
     }
   } else if (isSupportedSerializableType(attributeValue)) {
-    spanJSON.attributes[attributeKey] = attributeValueToSerializedAttribute(attributeValue);
+    spanJSON.attributes[attributeKey] = attributeValueToTypedAttributeValue(attributeValue);
   }
 }
 
@@ -118,8 +117,8 @@ const knownContexts = [
   'state',
   // set by `replayIntegration`
   'Replays',
-  // set by feature flags integration(s)
-  'flags',
+  // Other information:
+  // - no need to handler feature flags `flags` context because it's already added to the active span
 ];
 
 /**

packages/core/src/types-hoist/span.ts

@@ -1,4 +1,4 @@
-import type { SerializedAttributes } from './attributes';
+import type { TypedAttributes } from '../attributes';
 import type { SpanLink, SpanLinkJSON } from './link';
 import type { Measurements } from './measurement';
 import type { HrTime } from './opentelemetry';
@@ -47,8 +47,8 @@ export interface SpanV2JSON {
   end_timestamp: number;
   status: 'ok' | 'error';
   is_segment: boolean;
-  attributes?: SerializedAttributes;
-  links?: SpanLinkJSON<SerializedAttributes>[];
+  attributes?: TypedAttributes;
+  links?: SpanLinkJSON<TypedAttributes>[];
 }
 
 /**

packages/core/src/utils/spanUtils.ts

@@ -1,4 +1,5 @@
 import { getAsyncContextStrategy } from '../asyncContext';
+import { attributeValueToTypedAttributeValue, TypedAttributes } from '../attributes';
 import { getMainCarrier } from '../carrier';
 import { getCurrentScope } from '../currentScopes';
 import {
@@ -111,7 +112,7 @@ export function convertSpanLinksForEnvelope(links?: SpanLink[]): SpanLinkJSON[]
  * @param links
  * @returns
  */
-export function getV2SpanLinks(links?: SpanLink[]): SpanLinkJSON<SerializedAttributes>[] | undefined {
+export function getV2SpanLinks(links?: SpanLink[]): SpanLinkJSON<TypedAttributes>[] | undefined {
   if (links?.length) {
     return links.map(({ context: { spanId, traceId, traceFlags, ...restContext }, attributes }) => ({
       span_id: spanId,
@@ -320,11 +321,11 @@ export function getV2StatusMessage(status: SpanStatus | undefined): 'ok' | 'erro
 /**
  * Convert the attributes to the ones expected by Sentry, including the type annotation
  */
-export function getV2Attributes(attributes: SpanAttributes): SerializedAttributes {
+export function getV2Attributes(attributes: SpanAttributes): TypedAttributes {
   return Object.entries(attributes).reduce((acc, [key, value]) => {
-    acc[key] = attributeValueToSerializedAttribute(value);
+    acc[key] = attributeValueToTypedAttributeValue(value);
     return acc;
-  }, {} as SerializedAttributes);
+  }, {} as TypedAttributes);
 }
 
 const CHILD_SPANS_FIELD = '_sentryChildSpans';