adjust after scope attribute changes

Author: Lms24

dev-packages/browser-integration-tests/suites/public-api/logger/integration/test.ts

@@ -166,7 +166,7 @@ sentryTest('should capture console object calls', async ({ getLocalTestUrl, page
             'sentry.message.template': { value: 'Mixed: {} {} {} {}', type: 'string' },
             'sentry.message.parameter.0': { value: 'prefix', type: 'string' },
             'sentry.message.parameter.1': { value: '{"obj":true}', type: 'string' },
-            'sentry.message.parameter.2': { value: '[4,5,6]', type: 'string' },
+            'sentry.message.parameter.2': { value: [4, 5, 6], type: 'integer[]' },
             'sentry.message.parameter.3': { value: 'suffix', type: 'string' },
           },
         },
@@ -235,7 +235,7 @@ sentryTest('should capture console object calls', async ({ getLocalTestUrl, page
             'sentry.message.template': { value: 'hello {} {} {}', type: 'string' },
             'sentry.message.parameter.0': { value: true, type: 'boolean' },
             'sentry.message.parameter.1': { value: 'null', type: 'string' },
-            'sentry.message.parameter.2': { value: '', type: 'string' },
+            'sentry.message.parameter.2': { value: 'undefined', type: 'string' },
           },
         },
       ],

packages/core/src/attributes.ts

@@ -2,7 +2,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 } ? AttributeWithUnit : 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/logs/internal.ts

@@ -1,4 +1,4 @@
-import type { TypedAttributes } from '../attributes';
+import type { TypedAttributeValue } from '../attributes';
 import { attributeValueToTypedAttributeValue } from '../attributes';
 import { getGlobalSingleton } from '../carrier';
 import type { Client } from '../client';
@@ -139,7 +139,7 @@ export function _INTERNAL_captureLog(
   // Add the parent span ID to the log attributes for trace context
   setLogAttribute(processedLogAttributes, 'sentry.trace.parent_span_id', span?.spanContext().spanId);
 
-  const processedLog = { ...beforeLog, attributes: processedLogAttributes };
+  const processedLog = { ...beforeLog, attributes: { ...scopeAttributes, ...processedLogAttributes } };
 
   client.emit('beforeCaptureLog', processedLog);
 
@@ -159,14 +159,13 @@ export function _INTERNAL_captureLog(
     body: message,
     trace_id: traceContext?.trace_id,
     severity_number: severityNumber ?? SEVERITY_TEXT_TO_SEVERITY_NUMBER[level],
-    attributes: {
-      // TODO: This is too late to apply scope attributes because we already invoked beforeSendLog earlier.
-      ...scopeAttributes,
-      ...Object.keys(attributes).reduce((acc, key) => {
+    attributes: Object.keys(attributes).reduce(
+      (acc, key) => {
         acc[key] = attributeValueToTypedAttributeValue(attributes[key]);
         return acc;
-      }, {} as TypedAttributes),
-    },
+      },
+      {} as Record<string, TypedAttributeValue>,
+    ),
   };
 
   captureSerializedLog(client, serializedLog);

packages/core/test/lib/logs/internal.test.ts

@@ -178,11 +178,11 @@ describe('_INTERNAL_captureLog', () => {
       scope.setClient(client);
 
       scope.setAttribute('scope_1', 'attribute_value');
-      scope.setAttribute('scope_2', { value: 143.5, type: 'double', unit: 'bytes' });
+      scope.setAttribute('scope_2', { value: 38, unit: 'gigabytes' });
       scope.setAttributes({
         scope_3: true,
         scope_4: [1, 2, 3],
-        scope_5: { value: [true, false, true], type: 'boolean[]', unit: 's' },
+        scope_5: { value: [true, false, true], unit: 's' },
       });
 
       _INTERNAL_captureLog(
@@ -210,9 +210,9 @@ describe('_INTERNAL_captureLog', () => {
           value: 'attribute_value',
         },
         scope_2: {
-          type: 'double',
-          unit: 'bytes',
-          value: 143.5,
+          type: 'integer',
+          unit: 'gigabytes',
+          value: 38,
         },
         scope_3: {
           type: 'boolean',
@@ -315,7 +315,7 @@ describe('_INTERNAL_captureLog', () => {
     scope.setClient(client);
 
     scope.setAttribute('scope_1', 'attribute_value');
-    scope.setAttribute('scope_2', { value: 143.5, type: 'double', unit: 'bytes' });
+    scope.setAttribute('scope_2', { value: 38, unit: 'gigabytes' });
 
     _INTERNAL_captureLog(
       {
@@ -331,9 +331,9 @@ describe('_INTERNAL_captureLog', () => {
       message: 'original message',
       attributes: {
         original: true,
-        // scope attributes should already be applied prior to beforeSendLog
+        // attributes here still have the same form as originally set on the scope or log
         scope_1: 'attribute_value',
-        scope_2: { value: 143.5, type: 'double', unit: 'bytes' },
+        scope_2: { value: 38, unit: 'gigabytes' },
       },
     });
 
@@ -351,6 +351,16 @@ describe('_INTERNAL_captureLog', () => {
             value: true,
             type: 'boolean',
           },
+          // during serialization, they're converted to the typed attribute format
+          scope_1: {
+            value: 'attribute_value',
+            type: 'string',
+          },
+          scope_2: {
+            value: 38,
+            unit: 'gigabytes',
+            type: 'integer',
+          },
         },
       }),
     );