optimize attribute serilaization

Author: Lms24

packages/core/src/attributes.ts

@@ -61,8 +61,6 @@ export function isAttributeObject(maybeObj: unknown): maybeObj is AttributeObjec
   );
 }
 
-export function attributeValueToTypedAttributeValue(rawValue: unknown, useFallback?: true): TypedAttributeValue;
-
 /**
  * Converts an attribute value to a typed attribute value.
  *
@@ -77,7 +75,7 @@ export function attributeValueToTypedAttributeValue(rawValue: unknown, useFallba
  */
 export function attributeValueToTypedAttributeValue(
   rawValue: unknown,
-  useFallback = false,
+  useFallback?: boolean,
 ): TypedAttributeValue | void {
   const { value, unit } = isAttributeObject(rawValue) ? rawValue : { value: rawValue, unit: undefined };
   const attributeValue = getTypedAttributeValue(value);
@@ -106,6 +104,26 @@ export function attributeValueToTypedAttributeValue(
   };
 }
 
+/**
+ * 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.
+ */
+export function serializeAttributes<T>(attributes: RawAttributes<T>, fallback: boolean = false): Attributes {
+  const serializedAttributes: Attributes = {};
+  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,

packages/core/src/logs/internal.ts

@@ -1,4 +1,4 @@
-import { attributeValueToTypedAttributeValue } from '../attributes';
+import { Attributes, attributeValueToTypedAttributeValue, RawAttributes, serializeAttributes } from '../attributes';
 import { getGlobalSingleton } from '../carrier';
 import type { Client } from '../client';
 import { getClient, getCurrentScope, getGlobalScope, getIsolationScope } from '../currentScopes';
@@ -155,25 +155,15 @@ export function _INTERNAL_captureLog(
 
   const { level, message, attributes: logAttributes = {}, severityNumber } = log;
 
-  const serializedScopeAttributes = Object.fromEntries(
-    Object.entries(scopeAttributes)
-      .map(([key, value]) => [key, attributeValueToTypedAttributeValue(value)])
-      .filter(([, value]) => value != null),
-  );
-
-  const serializedLogAttributes = Object.fromEntries(
-    Object.entries(logAttributes).map(([key, value]) => [key, attributeValueToTypedAttributeValue(value, true)]),
-  );
-
   const serializedLog: SerializedLog = {
     timestamp: timestampInSeconds(),
     level,
     body: message,
     trace_id: traceContext?.trace_id,
     severity_number: severityNumber ?? SEVERITY_TEXT_TO_SEVERITY_NUMBER[level],
     attributes: {
-      ...serializedScopeAttributes,
-      ...serializedLogAttributes,
+      ...serializeAttributes(scopeAttributes),
+      ...serializeAttributes(logAttributes, true),
     },
   };