skip undefined if fallback is skip-undefined

Author: Lms24

packages/core/src/attributes.ts

@@ -75,7 +75,7 @@ export function isAttributeObject(maybeObj: unknown): maybeObj is AttributeObjec
  */
 export function attributeValueToTypedAttributeValue(
   rawValue: unknown,
-  useFallback?: boolean,
+  useFallback?: boolean | 'skip-undefined',
 ): TypedAttributeValue | void {
   const { value, unit } = isAttributeObject(rawValue) ? rawValue : { value: rawValue, unit: undefined };
   const attributeValue = getTypedAttributeValue(value);
@@ -84,7 +84,7 @@ export function attributeValueToTypedAttributeValue(
     return { ...attributeValue, ...checkedUnit };
   }
 
-  if (!useFallback) {
+  if (!useFallback || (useFallback === 'skip-undefined' && value === undefined)) {
     return;
   }
 
@@ -115,7 +115,7 @@ export function attributeValueToTypedAttributeValue(
  */
 export function serializeAttributes<T>(
   attributes: RawAttributes<T> | undefined,
-  fallback: boolean = false,
+  fallback: boolean | 'skip-undefined' = false,
 ): Attributes {
   const serializedAttributes: Attributes = {};
   for (const [key, value] of Object.entries(attributes ?? {})) {

packages/core/src/metrics/internal.ts

@@ -140,7 +140,7 @@ function _buildSerializedMetric(metric: Metric, client: Client, currentScope: Sc
     type: metric.type,
     unit: metric.unit,
     value: metric.value,
-    attributes: serializeAttributes(metric.attributes, true),
+    attributes: serializeAttributes(metric.attributes, 'skip-undefined'),
   };
 }
 

packages/core/test/lib/attributes.test.ts

@@ -294,6 +294,16 @@ describe('attributeValueToTypedAttributeValue', () => {
       });
     });
   });
+
+  describe('with fallback="skip-undefined"', () => {
+    it.each([undefined, { value: undefined }, { value: undefined, unit: 'byte' }])(
+      'ignores undefined values (%s)',
+      value => {
+        const result = attributeValueToTypedAttributeValue(value, 'skip-undefined');
+        expect(result).toBeUndefined();
+      },
+    );
+  });
 });
 
 describe('isAttributeObject', () => {
@@ -361,6 +371,14 @@ describe('serializeAttributes', () => {
     expect(result).toStrictEqual({});
   });
 
+  it('ignores undefined values if fallback is "skip-undefined"', () => {
+    const result = serializeAttributes(
+      { foo: undefined, bar: { value: undefined }, baz: { value: undefined, unit: 'byte' } },
+      'skip-undefined',
+    );
+    expect(result).toStrictEqual({});
+  });
+
   it('stringifies undefined values to "" if fallback is true', () => {
     const result = serializeAttributes(
       { foo: undefined, bar: { value: undefined }, baz: { value: undefined, unit: 'byte' } },