some adjustments

Author: Lms24

packages/core/src/utils/baggage.ts

@@ -33,7 +33,7 @@ export function baggageHeaderToDynamicSamplingContext(
 
   // Read all "sentry-" prefixed values out of the baggage object and put it onto a dynamic sampling context object.
   const dynamicSamplingContext = Object.entries(baggageObject).reduce<Record<string, string>>((acc, [key, value]) => {
-    if (key.startsWith(SENTRY_BAGGAGE_KEY_PREFIX)) {
+    if (key.match(SENTRY_BAGGAGE_KEY_PREFIX)) {
       const nonPrefixedKey = key.slice(SENTRY_BAGGAGE_KEY_PREFIX.length);
       acc[nonPrefixedKey] = value;
     }

packages/core/src/utils/envelope.ts

@@ -204,9 +204,11 @@ export function createAttachmentEnvelopeItem(attachment: Attachment): Attachment
   ];
 }
 
+type OverriddenItemType = Exclude<EnvelopeItemType, DataCategory>;
+
 // Map of envelope item types to data categories where the category differs from the type.
 // Types that map to themselves (session, attachment, transaction, profile, feedback, span, metric) fall through.
-const DATA_CATEGORY_OVERRIDES: Partial<Record<string, DataCategory>> = {
+const DATA_CATEGORY_OVERRIDES: Record<OverriddenItemType, DataCategory> = {
   sessions: 'session',
   event: 'error',
   client_report: 'internal',
@@ -220,11 +222,15 @@ const DATA_CATEGORY_OVERRIDES: Partial<Record<string, DataCategory>> = {
   trace_metric: 'metric',
 };
 
+function _isOverriddenType(type: EnvelopeItemType): type is OverriddenItemType {
+  return type in DATA_CATEGORY_OVERRIDES;
+}
+
 /**
  * Maps the type of an envelope item to a data category.
  */
 export function envelopeItemTypeToDataCategory(type: EnvelopeItemType): DataCategory {
-  return DATA_CATEGORY_OVERRIDES[type] || (type as DataCategory);
+  return _isOverriddenType(type) ? DATA_CATEGORY_OVERRIDES[type] : type;
 }
 
 /** Extracts the minimal SDK info from the metadata or an events */

packages/core/src/utils/object.ts

@@ -55,6 +55,7 @@ export function fill(source: { [key: string]: any }, name: string, replacementFa
 export function addNonEnumerableProperty(obj: object, name: string, value: unknown): void {
   try {
     Object.defineProperty(obj, name, {
+      // enumerable: false, // the default, so we can save on bundle size by not explicitly setting it
       value,
       writable: true,
       configurable: true,