Skip to content

Commit 10d8743

Browse files
committed
refactor: use JSON.stringify to format log messages
1 parent 2673088 commit 10d8743

File tree

6 files changed

+15
-17
lines changed

6 files changed

+15
-17
lines changed

packages/opentelemetry-core/src/common/logging-error-handler.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ function stringifyException(ex: Exception | string): string {
3838
if (typeof ex === 'string') {
3939
return ex;
4040
} else {
41-
return Object.entries(flattenException(ex))
42-
.map(([k, v]) => `${k}: ${v}`)
43-
.join('\n');
41+
return JSON.stringify(flattenException(ex));
4442
}
4543
}
4644

packages/opentelemetry-core/test/common/logging-error-handler.test.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ describe('loggingErrorHandler', () => {
5252

5353
const [result] = errorStub.lastCall.args;
5454

55-
assert.ok(result.includes(`name: ${err.name}`));
56-
assert.ok(result.includes(`message: ${err.message}`));
57-
assert.ok(result.includes(`randomString: ${err.randomString}`));
58-
assert.ok(result.includes(`randomNumber: ${err.randomNumber}`));
59-
assert.ok(result.includes(`randomArray: ${err.randomArray}`));
60-
assert.ok(result.includes(`randomObject: ${err.randomObject}`));
61-
assert.ok(result.includes(`stack: ${err.stack}`));
55+
assert.ok(result.includes(err.name));
56+
assert.ok(result.includes(err.message));
57+
assert.ok(result.includes(err.randomString));
58+
assert.ok(result.includes(err.randomNumber));
59+
assert.ok(result.includes(err.randomArray));
60+
assert.ok(result.includes(err.randomObject));
61+
assert.ok(result.includes(JSON.stringify(err.stack)));
6262
});
6363

6464
it('logs from an error', () => {
@@ -68,8 +68,8 @@ describe('loggingErrorHandler', () => {
6868

6969
const [result] = errorStub.lastCall.args;
7070

71-
assert.ok(result.includes(`name: ${err.name}`));
72-
assert.ok(result.includes(`message: ${err.message}`));
73-
assert.ok(result.includes(`stack: ${err.stack}`));
71+
assert.ok(result.includes(err.name));
72+
assert.ok(result.includes(err.message));
73+
assert.ok(result.includes(JSON.stringify(err.stack)));
7474
});
7575
});

packages/opentelemetry-exporter-collector-proto/test/CollectorMetricExporter.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ describe('CollectorMetricExporter - node with proto over http', () => {
195195
callback(mockResError);
196196
setTimeout(() => {
197197
const response = spyLoggerError.args[0][0] as string;
198-
assert.ok(response.includes('code: 400'));
198+
assert.ok(response.includes('"code":"400"'));
199199
assert.strictEqual(responseSpy.args[0][0], 1);
200200
done();
201201
});

packages/opentelemetry-exporter-collector-proto/test/CollectorTraceExporter.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ describe('CollectorTraceExporter - node with proto over http', () => {
163163
setTimeout(() => {
164164
const response = spyLoggerError.args[0][0] as string;
165165

166-
assert.ok(response.includes('code: 400'));
166+
assert.ok(response.includes('"code":"400"'));
167167
assert.strictEqual(responseSpy.args[0][0], 1);
168168
done();
169169
});

packages/opentelemetry-exporter-collector/test/browser/CollectorMetricExporter.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ describe('CollectorMetricExporter - web', () => {
332332
request.respond(400);
333333

334334
const response = spyLoggerError.args[0][0] as string;
335-
assert.ok(response.includes('code: 400'));
335+
assert.ok(response.includes('"code":"400"'));
336336

337337
assert.strictEqual(spyBeacon.callCount, 0);
338338
done();

packages/opentelemetry-exporter-collector/test/browser/CollectorTraceExporter.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ describe('CollectorTraceExporter - web', () => {
253253

254254
const response = spyLoggerError.args[0][0] as string;
255255

256-
assert.ok(response.includes('code: 400'));
256+
assert.ok(response.includes('"code":"400"'));
257257

258258
assert.strictEqual(spyBeacon.callCount, 0);
259259
done();

0 commit comments

Comments
 (0)