Skip to content

Commit b35747e

Browse files
committed
test: parseLogAttributes
1 parent c51281e commit b35747e

File tree

4 files changed

+50
-2
lines changed

4 files changed

+50
-2
lines changed

packages/node-opentelemetry/examples/dummy.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,16 @@ app.get('/logs', async (req, res) => {
305305
headers: req.headers,
306306
method: req.method,
307307
url: req.url,
308+
nested: [
309+
{
310+
foo: 'bar',
311+
},
312+
],
313+
nested2: {
314+
nested3: {
315+
foo: 'bar',
316+
},
317+
},
308318
});
309319
pinoLogger.info('Pino 🍕');
310320

packages/node-opentelemetry/src/otel-logger/__tests__/__snapshots__/index.test.ts.snap

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,24 @@ exports[`otel-logger getSeverityNumber 1`] = `
1313
"warning": 13,
1414
}
1515
`;
16+
17+
exports[`otel-logger parseLogAttributes 1`] = `
18+
{
19+
"a": 1,
20+
"b": "2",
21+
"c": "[{"d":3}]",
22+
"e": [
23+
1,
24+
2,
25+
3,
26+
],
27+
"f": [
28+
"a",
29+
"b",
30+
"c",
31+
],
32+
"g": {
33+
"h": "i",
34+
},
35+
}
36+
`;

packages/node-opentelemetry/src/otel-logger/__tests__/index.test.ts

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getSeverityNumber } from '..';
1+
import { getSeverityNumber, parseLogAttributes } from '..';
22

33
describe('otel-logger', () => {
44
it('getSeverityNumber', () => {
@@ -14,4 +14,19 @@ describe('otel-logger', () => {
1414
warning: getSeverityNumber('warning'),
1515
}).toMatchSnapshot();
1616
});
17+
18+
it('parseLogAttributes', () => {
19+
expect(
20+
parseLogAttributes({
21+
a: 1,
22+
b: '2',
23+
c: [{ d: 3 }],
24+
e: [1, 2, 3],
25+
f: ['a', 'b', 'c'],
26+
g: {
27+
h: 'i',
28+
},
29+
}),
30+
).toMatchSnapshot();
31+
});
1732
});

packages/node-opentelemetry/src/otel-logger/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ export const parseLogAttributes = (
101101
if (isPlainObject(firstItem)) {
102102
attributes[key] = jsonToString(value);
103103
}
104-
} else {
104+
}
105+
106+
if (attributes[key] === undefined) {
105107
attributes[key] = value;
106108
}
107109
}

0 commit comments

Comments
 (0)