@sentry/core 10.32.0-alpha.0 → 10.32.1

package/build/cjs/attributes.js

@@ -1,8 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const debugBuild = require('./debug-build.js');
-const debugLogger = require('./utils/debug-logger.js');
-
 /**
  * Type-guard: The attribute object has the shape the official attribute object (value, type, unit).
  * https://develop.sentry.dev/sdk/telemetry/scopes/#setting-attributes
@@ -19,33 +16,88 @@ function isAttributeObject(maybeObj) {
 /**
  * Converts an attribute value to a typed attribute value.
  *
- * Does not allow mixed arrays. In case of a mixed array, the value is stringified and the type is 'string'.
- * All values besides the supported attribute types (see {@link AttributeTypeMap}) are stringified to a string attribute value.
+ * For now, we intentionally only support primitive values and attribute objects with primitive values.
+ * If @param useFallback is true, we stringify non-primitive values to a string attribute value. Otherwise
+ * we return `undefined` for unsupported values.
  *
  * @param value - The value of the passed attribute.
+ * @param useFallback - If true, unsupported values will be stringified to a string attribute value.
+ *                      Defaults to false. In this case, `undefined` is returned for unsupported values.
  * @returns The typed attribute.
  */
-function attributeValueToTypedAttributeValue(rawValue) {
+function attributeValueToTypedAttributeValue(
+  rawValue,
+  useFallback,
+) {
   const { value, unit } = isAttributeObject(rawValue) ? rawValue : { value: rawValue, unit: undefined };
-  return { ...getTypedAttributeValue(value), ...(unit && typeof unit === 'string' ? { unit } : {}) };
-}
+  const attributeValue = getTypedAttributeValue(value);
+  const checkedUnit = unit && typeof unit === 'string' ? { unit } : {};
+  if (attributeValue) {
+    return { ...attributeValue, ...checkedUnit };
+  }
 
-// Only allow string, boolean, or number types
-const getPrimitiveType
+  if (!useFallback) {
+    return;
+  }
 
- = item =>
-  typeof item === 'string'
-    ? 'string'
-    : typeof item === 'boolean'
-      ? 'boolean'
-      : typeof item === 'number' && !Number.isNaN(item)
-        ? Number.isInteger(item)
-          ? 'integer'
-          : 'double'
-        : null;
+  // Fallback: stringify the value
+  // TODO(v11): be smarter here and use String constructor if stringify fails
+  // (this is a breaking change for already existing attribute values)
+  let stringValue = '';
+  try {
+    stringValue = JSON.stringify(value) ?? '';
+  } catch {
+    // Do nothing
+  }
+  return {
+    value: stringValue,
+    type: 'string',
+    ...checkedUnit,
+  };
+}
 
+/**
+ * Serializes raw attributes to typed attributes as expected in our envelopes.
+ *
+ * @param attributes The raw attributes to serialize.
+ * @param fallback   If true, unsupported values will be stringified to a string attribute value.
+ *                   Defaults to false. In this case, `undefined` is returned for unsupported values.
+ *
+ * @returns The serialized attributes.
+ */
+function serializeAttributes(attributes, fallback = false) {
+  const serializedAttributes = {};
+  for (const [key, value] of Object.entries(attributes)) {
+    const typedValue = attributeValueToTypedAttributeValue(value, fallback);
+    if (typedValue) {
+      serializedAttributes[key] = typedValue;
+    }
+  }
+  return serializedAttributes;
+}
+
+/**
+ * NOTE: We intentionally do not return anything for non-primitive values:
+ *  - array support will come in the future but if we stringify arrays now,
+ *    sending arrays (unstringified) later will be a subtle breaking change.
+ *  - Objects are not supported yet and product support is still TBD.
+ *  - We still keep the type signature for TypedAttributeValue wider to avoid a
+ *    breaking change once we add support for non-primitive values.
+ *  - Once we go back to supporting arrays and stringifying all other values,
+ *    we already implemented the serialization logic here:
+ *    https://github.com/getsentry/sentry-javascript/pull/18165
+ */
 function getTypedAttributeValue(value) {
-  const primitiveType = getPrimitiveType(value);
+  const primitiveType =
+    typeof value === 'string'
+      ? 'string'
+      : typeof value === 'boolean'
+        ? 'boolean'
+        : typeof value === 'number' && !Number.isNaN(value)
+          ? Number.isInteger(value)
+            ? 'integer'
+            : 'double'
+          : null;
   if (primitiveType) {
     // @ts-expect-error - TS complains because {@link TypedAttributeValue} is strictly typed to
     // avoid setting the wrong `type` on the attribute value.
@@ -55,44 +107,9 @@ function getTypedAttributeValue(value) {
     // Therefore, we ignore it.
     return { value, type: primitiveType };
   }
-
-  if (Array.isArray(value)) {
-    const coherentArrayType = value.reduce((acc, item) => {
-      if (!acc || getPrimitiveType(item) !== acc) {
-        return null;
-      }
-      return acc;
-    }, getPrimitiveType(value[0]));
-
-    if (coherentArrayType) {
-      return { value, type: `${coherentArrayType}[]` };
-    }
-  }
-
-  // Fallback: stringify the passed value
-  let fallbackValue = '';
-  try {
-    fallbackValue = JSON.stringify(value) ?? String(value);
-  } catch {
-    try {
-      fallbackValue = String(value);
-    } catch {
-      debugBuild.DEBUG_BUILD && debugLogger.debug.warn('Failed to stringify attribute value', value);
-      // ignore
-    }
-  }
-
-  // This is quite a low-quality message but we cannot safely log the original `value`
-  // here due to String() or JSON.stringify() potentially throwing.
-  debugBuild.DEBUG_BUILD &&
-    debugLogger.debug.log(`Stringified attribute value to ${fallbackValue} because it's not a supported attribute value type`);
-
-  return {
-    value: fallbackValue,
-    type: 'string',
-  };
 }
 
 exports.attributeValueToTypedAttributeValue = attributeValueToTypedAttributeValue;
 exports.isAttributeObject = isAttributeObject;
+exports.serializeAttributes = serializeAttributes;
 //# sourceMappingURL=attributes.js.map

package/build/cjs/attributes.js.map

@@ -1 +1 @@
-{"version":3,"file":"attributes.js","sources":["../../src/attributes.ts"],"sourcesContent":["import { DEBUG_BUILD } from './debug-build';\nimport type { DurationUnit, FractionUnit, InformationUnit } from './types-hoist/measurement';\nimport { debug } from './utils/debug-logger';\n\nexport type RawAttributes<T> = T & ValidatedAttributes<T>;\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type RawAttribute<T> = T extends { value: any } | { unit: any } ? AttributeObject : T;\n\nexport type TypedAttributes = Record<string, TypedAttributeValue>;\n\nexport type AttributeValueType = string | number | boolean | Array<string> | Array<number> | Array<boolean>;\n\ntype AttributeTypeMap = {\n  string: string;\n  integer: number;\n  double: number;\n  boolean: boolean;\n  'string[]': Array<string>;\n  'integer[]': Array<number>;\n  'double[]': Array<number>;\n  'boolean[]': Array<boolean>;\n};\n\n/* Generates a type from the AttributeTypeMap like:\n  | { value: string; type: 'string' }\n  | { value: number; type: 'integer' }\n  | { value: number; type: 'double' }\n */\ntype AttributeUnion = {\n  [K in keyof AttributeTypeMap]: {\n    value: AttributeTypeMap[K];\n    type: K;\n  };\n}[keyof AttributeTypeMap];\n\nexport type TypedAttributeValue = AttributeUnion & { unit?: AttributeUnit };\n\nexport type AttributeObject = {\n  value: unknown;\n  unit?: AttributeUnit;\n};\n\n// Unfortunately, we loose type safety if we did something like Exclude<MeasurementUnit, string>\n// so therefore we unionize between the three supported unit categories.\nexport type AttributeUnit = DurationUnit | InformationUnit | FractionUnit;\n\n/* If an attribute has either a 'value' or 'unit' property, we use the ValidAttributeObject type. */\nexport type ValidatedAttributes<T> = {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  [K in keyof T]: T[K] extends { value: any } | { unit: any } ? AttributeObject : unknown;\n};\n\n/**\n * Type-guard: The attribute object has the shape the official attribute object (value, type, unit).\n * https://develop.sentry.dev/sdk/telemetry/scopes/#setting-attributes\n */\nexport function isAttributeObject(maybeObj: unknown): maybeObj is AttributeObject {\n  return (\n    typeof maybeObj === 'object' &&\n    maybeObj != null &&\n    !Array.isArray(maybeObj) &&\n    Object.keys(maybeObj).includes('value')\n  );\n}\n\n/**\n * Converts an attribute value to a typed attribute value.\n *\n * Does not allow mixed arrays. In case of a mixed array, the value is stringified and the type is 'string'.\n * All values besides the supported attribute types (see {@link AttributeTypeMap}) are stringified to a string attribute value.\n *\n * @param value - The value of the passed attribute.\n * @returns The typed attribute.\n */\nexport function attributeValueToTypedAttributeValue(rawValue: unknown): TypedAttributeValue {\n  const { value, unit } = isAttributeObject(rawValue) ? rawValue : { value: rawValue, unit: undefined };\n  return { ...getTypedAttributeValue(value), ...(unit && typeof unit === 'string' ? { unit } : {}) };\n}\n\n// Only allow string, boolean, or number types\nconst getPrimitiveType: (\n  item: unknown,\n) => keyof Pick<AttributeTypeMap, 'string' | 'integer' | 'double' | 'boolean'> | null = item =>\n  typeof item === 'string'\n    ? 'string'\n    : typeof item === 'boolean'\n      ? 'boolean'\n      : typeof item === 'number' && !Number.isNaN(item)\n        ? Number.isInteger(item)\n          ? 'integer'\n          : 'double'\n        : null;\n\nfunction getTypedAttributeValue(value: unknown): TypedAttributeValue {\n  const primitiveType = getPrimitiveType(value);\n  if (primitiveType) {\n    // @ts-expect-error - TS complains because {@link TypedAttributeValue} is strictly typed to\n    // avoid setting the wrong `type` on the attribute value.\n    // In this case, getPrimitiveType already does the check but TS doesn't know that.\n    // The \"clean\" alternative is to return an object per `typeof value` case\n    // but that would require more bundle size\n    // Therefore, we ignore it.\n    return { value, type: primitiveType };\n  }\n\n  if (Array.isArray(value)) {\n    const coherentArrayType = value.reduce((acc: 'string' | 'boolean' | 'integer' | 'double' | null, item) => {\n      if (!acc || getPrimitiveType(item) !== acc) {\n        return null;\n      }\n      return acc;\n    }, getPrimitiveType(value[0]));\n\n    if (coherentArrayType) {\n      return { value, type: `${coherentArrayType}[]` };\n    }\n  }\n\n  // Fallback: stringify the passed value\n  let fallbackValue = '';\n  try {\n    fallbackValue = JSON.stringify(value) ?? String(value);\n  } catch {\n    try {\n      fallbackValue = String(value);\n    } catch {\n      DEBUG_BUILD && debug.warn('Failed to stringify attribute value', value);\n      // ignore\n    }\n  }\n\n  // This is quite a low-quality message but we cannot safely log the original `value`\n  // here due to String() or JSON.stringify() potentially throwing.\n  DEBUG_BUILD &&\n    debug.log(`Stringified attribute value to ${fallbackValue} because it's not a supported attribute value type`);\n\n  return {\n    value: fallbackValue,\n    type: 'string',\n  };\n}\n"],"names":["DEBUG_BUILD","debug"],"mappings":";;;;;AAoDA;AACA;AACA;AACA;AACO,SAAS,iBAAiB,CAAC,QAAQ,EAAwC;AAClF,EAAE;AACF,IAAI,OAAO,QAAA,KAAa,QAAA;AACxB,IAAI,QAAA,IAAY,IAAA;AAChB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAA;AAC3B,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO;AAC1C;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,mCAAmC,CAAC,QAAQ,EAAgC;AAC5F,EAAE,MAAM,EAAE,KAAK,EAAE,MAAK,GAAI,iBAAiB,CAAC,QAAQ,CAAA,GAAI,QAAA,GAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAA,EAAW;AACvG,EAAE,OAAO,EAAE,GAAG,sBAAsB,CAAC,KAAK,CAAC,EAAE,IAAI,IAAA,IAAQ,OAAO,IAAA,KAAS,QAAA,GAAW,EAAE,IAAA,KAAS,EAAE,CAAA,EAAG;AACpG;;AAEA;AACA,MAAM;;AAEN,GAAwF,IAAA;AACxF,EAAE,OAAO,SAAS;AAClB,MAAM;AACN,MAAM,OAAO,IAAA,KAAS;AACtB,QAAQ;AACR,QAAQ,OAAO,IAAA,KAAS,QAAA,IAAY,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI;AACtD,UAAU,MAAM,CAAC,SAAS,CAAC,IAAI;AAC/B,YAAY;AACZ,YAAY;AACZ,UAAU,IAAI;;AAEd,SAAS,sBAAsB,CAAC,KAAK,EAAgC;AACrE,EAAE,MAAM,aAAA,GAAgB,gBAAgB,CAAC,KAAK,CAAC;AAC/C,EAAE,IAAI,aAAa,EAAE;AACrB;AACA;AACA;AACA;AACA;AACA;AACA,IAAI,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe;AACzC,EAAE;;AAEF,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;AAC5B,IAAI,MAAM,iBAAA,GAAoB,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAsD,IAAI,KAAK;AAC9G,MAAM,IAAI,CAAC,GAAA,IAAO,gBAAgB,CAAC,IAAI,CAAA,KAAM,GAAG,EAAE;AAClD,QAAQ,OAAO,IAAI;AACnB,MAAM;AACN,MAAM,OAAO,GAAG;AAChB,IAAI,CAAC,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;;AAElC,IAAI,IAAI,iBAAiB,EAAE;AAC3B,MAAM,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAA,iBAAA,CAAA,EAAA,CAAA,EAAA;AACA,IAAA;AACA,EAAA;;AAEA;AACA,EAAA,IAAA,aAAA,GAAA,EAAA;AACA,EAAA,IAAA;AACA,IAAA,aAAA,GAAA,IAAA,CAAA,SAAA,CAAA,KAAA,CAAA,IAAA,MAAA,CAAA,KAAA,CAAA;AACA,EAAA,CAAA,CAAA,MAAA;AACA,IAAA,IAAA;AACA,MAAA,aAAA,GAAA,MAAA,CAAA,KAAA,CAAA;AACA,IAAA,CAAA,CAAA,MAAA;AACA,MAAAA,sBAAA,IAAAC,iBAAA,CAAA,IAAA,CAAA,qCAAA,EAAA,KAAA,CAAA;AACA;AACA,IAAA;AACA,EAAA;;AAEA;AACA;AACA,EAAAD,sBAAA;AACA,IAAAC,iBAAA,CAAA,GAAA,CAAA,CAAA,+BAAA,EAAA,aAAA,CAAA,kDAAA,CAAA,CAAA;;AAEA,EAAA,OAAA;AACA,IAAA,KAAA,EAAA,aAAA;AACA,IAAA,IAAA,EAAA,QAAA;AACA,GAAA;AACA;;;;;"}
+{"version":3,"file":"attributes.js","sources":["../../src/attributes.ts"],"sourcesContent":["import type { DurationUnit, FractionUnit, InformationUnit } from './types-hoist/measurement';\n\nexport type RawAttributes<T> = T & ValidatedAttributes<T>;\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type RawAttribute<T> = T extends { value: any } | { unit: any } ? AttributeObject : T;\n\nexport type Attributes = Record<string, TypedAttributeValue>;\n\nexport type AttributeValueType = string | number | boolean | Array<string> | Array<number> | Array<boolean>;\n\ntype AttributeTypeMap = {\n  string: string;\n  integer: number;\n  double: number;\n  boolean: boolean;\n  'string[]': Array<string>;\n  'integer[]': Array<number>;\n  'double[]': Array<number>;\n  'boolean[]': Array<boolean>;\n};\n\n/* Generates a type from the AttributeTypeMap like:\n  | { value: string; type: 'string' }\n  | { value: number; type: 'integer' }\n  | { value: number; type: 'double' }\n */\ntype AttributeUnion = {\n  [K in keyof AttributeTypeMap]: {\n    value: AttributeTypeMap[K];\n    type: K;\n  };\n}[keyof AttributeTypeMap];\n\nexport type TypedAttributeValue = AttributeUnion & { unit?: AttributeUnit };\n\nexport type AttributeObject = {\n  value: unknown;\n  unit?: AttributeUnit;\n};\n\n// Unfortunately, we loose type safety if we did something like Exclude<MeasurementUnit, string>\n// so therefore we unionize between the three supported unit categories.\ntype AttributeUnit = DurationUnit | InformationUnit | FractionUnit;\n\n/* If an attribute has either a 'value' or 'unit' property, we use the ValidAttributeObject type. */\nexport type ValidatedAttributes<T> = {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  [K in keyof T]: T[K] extends { value: any } | { unit: any } ? AttributeObject : unknown;\n};\n\n/**\n * Type-guard: The attribute object has the shape the official attribute object (value, type, unit).\n * https://develop.sentry.dev/sdk/telemetry/scopes/#setting-attributes\n */\nexport function isAttributeObject(maybeObj: unknown): maybeObj is AttributeObject {\n  return (\n    typeof maybeObj === 'object' &&\n    maybeObj != null &&\n    !Array.isArray(maybeObj) &&\n    Object.keys(maybeObj).includes('value')\n  );\n}\n\n/**\n * Converts an attribute value to a typed attribute value.\n *\n * For now, we intentionally only support primitive values and attribute objects with primitive values.\n * If @param useFallback is true, we stringify non-primitive values to a string attribute value. Otherwise\n * we return `undefined` for unsupported values.\n *\n * @param value - The value of the passed attribute.\n * @param useFallback - If true, unsupported values will be stringified to a string attribute value.\n *                      Defaults to false. In this case, `undefined` is returned for unsupported values.\n * @returns The typed attribute.\n */\nexport function attributeValueToTypedAttributeValue(\n  rawValue: unknown,\n  useFallback?: boolean,\n): TypedAttributeValue | void {\n  const { value, unit } = isAttributeObject(rawValue) ? rawValue : { value: rawValue, unit: undefined };\n  const attributeValue = getTypedAttributeValue(value);\n  const checkedUnit = unit && typeof unit === 'string' ? { unit } : {};\n  if (attributeValue) {\n    return { ...attributeValue, ...checkedUnit };\n  }\n\n  if (!useFallback) {\n    return;\n  }\n\n  // Fallback: stringify the value\n  // TODO(v11): be smarter here and use String constructor if stringify fails\n  // (this is a breaking change for already existing attribute values)\n  let stringValue = '';\n  try {\n    stringValue = JSON.stringify(value) ?? '';\n  } catch {\n    // Do nothing\n  }\n  return {\n    value: stringValue,\n    type: 'string',\n    ...checkedUnit,\n  };\n}\n\n/**\n * Serializes raw attributes to typed attributes as expected in our envelopes.\n *\n * @param attributes The raw attributes to serialize.\n * @param fallback   If true, unsupported values will be stringified to a string attribute value.\n *                   Defaults to false. In this case, `undefined` is returned for unsupported values.\n *\n * @returns The serialized attributes.\n */\nexport function serializeAttributes<T>(attributes: RawAttributes<T>, fallback: boolean = false): Attributes {\n  const serializedAttributes: Attributes = {};\n  for (const [key, value] of Object.entries(attributes)) {\n    const typedValue = attributeValueToTypedAttributeValue(value, fallback);\n    if (typedValue) {\n      serializedAttributes[key] = typedValue;\n    }\n  }\n  return serializedAttributes;\n}\n\n/**\n * NOTE: We intentionally do not return anything for non-primitive values:\n *  - array support will come in the future but if we stringify arrays now,\n *    sending arrays (unstringified) later will be a subtle breaking change.\n *  - Objects are not supported yet and product support is still TBD.\n *  - We still keep the type signature for TypedAttributeValue wider to avoid a\n *    breaking change once we add support for non-primitive values.\n *  - Once we go back to supporting arrays and stringifying all other values,\n *    we already implemented the serialization logic here:\n *    https://github.com/getsentry/sentry-javascript/pull/18165\n */\nfunction getTypedAttributeValue(value: unknown): TypedAttributeValue | void {\n  const primitiveType =\n    typeof value === 'string'\n      ? 'string'\n      : typeof value === 'boolean'\n        ? 'boolean'\n        : typeof value === 'number' && !Number.isNaN(value)\n          ? Number.isInteger(value)\n            ? 'integer'\n            : 'double'\n          : null;\n  if (primitiveType) {\n    // @ts-expect-error - TS complains because {@link TypedAttributeValue} is strictly typed to\n    // avoid setting the wrong `type` on the attribute value.\n    // In this case, getPrimitiveType already does the check but TS doesn't know that.\n    // The \"clean\" alternative is to return an object per `typeof value` case\n    // but that would require more bundle size\n    // Therefore, we ignore it.\n    return { value, type: primitiveType };\n  }\n}\n"],"names":[],"mappings":";;AAkDA;AACA;AACA;AACA;AACO,SAAS,iBAAiB,CAAC,QAAQ,EAAwC;AAClF,EAAE;AACF,IAAI,OAAO,QAAA,KAAa,QAAA;AACxB,IAAI,QAAA,IAAY,IAAA;AAChB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAA;AAC3B,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO;AAC1C;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,mCAAmC;AACnD,EAAE,QAAQ;AACV,EAAE,WAAW;AACb,EAA8B;AAC9B,EAAE,MAAM,EAAE,KAAK,EAAE,MAAK,GAAI,iBAAiB,CAAC,QAAQ,CAAA,GAAI,QAAA,GAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAA,EAAW;AACvG,EAAE,MAAM,cAAA,GAAiB,sBAAsB,CAAC,KAAK,CAAC;AACtD,EAAE,MAAM,WAAA,GAAc,IAAA,IAAQ,OAAO,IAAA,KAAS,QAAA,GAAW,EAAE,IAAA,EAAK,GAAI,EAAE;AACtE,EAAE,IAAI,cAAc,EAAE;AACtB,IAAI,OAAO,EAAE,GAAG,cAAc,EAAE,GAAG,aAAa;AAChD,EAAE;;AAEF,EAAE,IAAI,CAAC,WAAW,EAAE;AACpB,IAAI;AACJ,EAAE;;AAEF;AACA;AACA;AACA,EAAE,IAAI,WAAA,GAAc,EAAE;AACtB,EAAE,IAAI;AACN,IAAI,WAAA,GAAc,IAAI,CAAC,SAAS,CAAC,KAAK,CAAA,IAAK,EAAE;AAC7C,EAAE,EAAE,MAAM;AACV;AACA,EAAE;AACF,EAAE,OAAO;AACT,IAAI,KAAK,EAAE,WAAW;AACtB,IAAI,IAAI,EAAE,QAAQ;AAClB,IAAI,GAAG,WAAW;AAClB,GAAG;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,mBAAmB,CAAI,UAAU,EAAoB,QAAQ,GAAY,KAAK,EAAc;AAC5G,EAAE,MAAM,oBAAoB,GAAe,EAAE;AAC7C,EAAE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAA,IAAK,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;AACzD,IAAI,MAAM,aAAa,mCAAmC,CAAC,KAAK,EAAE,QAAQ,CAAC;AAC3E,IAAI,IAAI,UAAU,EAAE;AACpB,MAAM,oBAAoB,CAAC,GAAG,CAAA,GAAI,UAAU;AAC5C,IAAI;AACJ,EAAE;AACF,EAAE,OAAO,oBAAoB;AAC7B;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS,sBAAsB,CAAC,KAAK,EAAuC;AAC5E,EAAE,MAAM,aAAA;AACR,IAAI,OAAO,UAAU;AACrB,QAAQ;AACR,QAAQ,OAAO,KAAA,KAAU;AACzB,UAAU;AACV,UAAU,OAAO,KAAA,KAAU,QAAA,IAAY,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK;AAC1D,YAAY,MAAM,CAAC,SAAS,CAAC,KAAK;AAClC,cAAc;AACd,cAAc;AACd,YAAY,IAAI;AAChB,EAAE,IAAI,aAAa,EAAE;AACrB;AACA;AACA;AACA;AACA;AACA;AACA,IAAI,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe;AACzC,EAAE;AACF;;;;;;"}

package/build/cjs/client.js

@@ -11,7 +11,6 @@ const internal$1 = require('./metrics/internal.js');
 const session = require('./session.js');
 const dynamicSamplingContext = require('./tracing/dynamicSamplingContext.js');
 const base = require('./transports/base.js');
-const beforeSendSpan = require('./utils/beforeSendSpan.js');
 const clientreport = require('./utils/clientreport.js');
 const debugLogger = require('./utils/debug-logger.js');
 const dsn = require('./utils/dsn.js');
@@ -981,17 +980,13 @@ function _validateBeforeSendResult(
 /**
  * Process the matching `beforeSendXXX` callback.
  */
-
 function processBeforeSend(
   client,
   options,
   event,
   hint,
 ) {
-  const { beforeSend, beforeSendTransaction, ignoreSpans } = options;
-
-  const beforeSendSpan$1 = !beforeSendSpan.isV2BeforeSendSpanCallback(options.beforeSendSpan) && options.beforeSendSpan;
-
+  const { beforeSend, beforeSendTransaction, beforeSendSpan, ignoreSpans } = options;
   let processedEvent = event;
 
   if (isErrorEvent(processedEvent) && beforeSend) {
@@ -1000,7 +995,7 @@ function processBeforeSend(
 
   if (isTransactionEvent(processedEvent)) {
     // Avoid processing if we don't have to
-    if (beforeSendSpan$1 || ignoreSpans) {
+    if (beforeSendSpan || ignoreSpans) {
       // 1. Process root span
       const rootSpanJson = transactionEvent.convertTransactionEventToSpanJson(processedEvent);
 
@@ -1011,8 +1006,8 @@ function processBeforeSend(
       }
 
       // 1.2 If a `beforeSendSpan` callback is defined, process the root span
-      if (beforeSendSpan$1) {
-        const processedRootSpanJson = beforeSendSpan$1(rootSpanJson);
+      if (beforeSendSpan) {
+        const processedRootSpanJson = beforeSendSpan(rootSpanJson);
         if (!processedRootSpanJson) {
           spanUtils.showSpanDropWarning();
         } else {
@@ -1035,8 +1030,8 @@ function processBeforeSend(
           }
 
           // 2.b If a `beforeSendSpan` callback is defined, process the child span
-          if (beforeSendSpan$1) {
-            const processedSpan = beforeSendSpan$1(span);
+          if (beforeSendSpan) {
+            const processedSpan = beforeSendSpan(span);
             if (!processedSpan) {
               spanUtils.showSpanDropWarning();
               processedSpans.push(span);