From 9f987d7987ead2fc0918eb116afbe3637309e232 Mon Sep 17 00:00:00 2001 From: Bryan English Date: Wed, 22 Jan 2025 10:31:16 -0500 Subject: [PATCH 1/2] fix tracer flare log --- packages/dd-trace/src/flare/index.js | 3 +++ packages/dd-trace/test/flare.spec.js | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/dd-trace/src/flare/index.js b/packages/dd-trace/src/flare/index.js index 4a5166d45e1..a93ce931238 100644 --- a/packages/dd-trace/src/flare/index.js +++ b/packages/dd-trace/src/flare/index.js @@ -92,6 +92,9 @@ const flare = { function recordLog (msg) { if (tracerLogs.length > MAX_LOG_SIZE) return + if (msg && typeof msg === 'object') { + msg = JSON.stringify(msg) + } tracerLogs.write(`${msg}\n`) // TODO: gzip } diff --git a/packages/dd-trace/test/flare.spec.js b/packages/dd-trace/test/flare.spec.js index ac4133cd9e9..f50eb8f8c20 100644 --- a/packages/dd-trace/test/flare.spec.js +++ b/packages/dd-trace/test/flare.spec.js @@ -142,7 +142,7 @@ describe('Flare', () => { const content = file.buffer.toString() - expect(content).to.equal('foo\nbar\n') + expect(content).to.equal('foo\nbar\n{"foo":"bar"}\n') done() } catch (e) { @@ -155,6 +155,7 @@ describe('Flare', () => { debugChannel.publish('foo') debugChannel.publish('bar') + debugChannel.publish({foo: 'bar'}) flare.send(task) }) From 396aa8431a666c82b26e060708852fb075dee797 Mon Sep 17 00:00:00 2001 From: Bryan English Date: Wed, 22 Jan 2025 14:22:11 -0500 Subject: [PATCH 2/2] lint --- packages/dd-trace/test/flare.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dd-trace/test/flare.spec.js b/packages/dd-trace/test/flare.spec.js index f50eb8f8c20..1ece6432e2d 100644 --- a/packages/dd-trace/test/flare.spec.js +++ b/packages/dd-trace/test/flare.spec.js @@ -155,7 +155,7 @@ describe('Flare', () => { debugChannel.publish('foo') debugChannel.publish('bar') - debugChannel.publish({foo: 'bar'}) + debugChannel.publish({ foo: 'bar' }) flare.send(task) })