fix some type stuff

Author: edwardgou-sentry

packages/core/src/tracing/span.ts

@@ -143,10 +143,12 @@ export class Span implements SpanInterface {
     this.instrumenter = spanContext.instrumenter || 'sentry';
 
     this._attributes = {};
+    const { measurements, ...attributes } = spanContext.attributes || {};
     this.setAttributes({
       [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: spanContext.origin || 'manual',
       [SEMANTIC_ATTRIBUTE_SENTRY_OP]: spanContext.op,
-      ...spanContext.attributes,
+      [SEMANTIC_ATTRIBUTE_MEASUREMENTS]: measurements,
+      ...attributes,
     });
 
     // eslint-disable-next-line deprecation/deprecation

packages/core/test/lib/tracing/span.test.ts

@@ -105,9 +105,6 @@ describe('span', () => {
     it('disallows invalid attribute types', () => {
       const span = new Span();
 
-      /** @ts-expect-error this is invalid */
-      span.setAttribute('str', {});
-
       /** @ts-expect-error this is invalid */
       span.setAttribute('str', null);
 

packages/types/src/span.ts

@@ -22,7 +22,8 @@ export type SpanAttributeValue =
   | boolean
   | Array<null | undefined | string>
   | Array<null | undefined | number>
-  | Array<null | undefined | boolean>;
+  | Array<null | undefined | boolean>
+  | Measurements;
 
 export type SpanAttributes = Partial<{
   'sentry.origin': string;