From 6dc1e412c667792e82df9bc4090cf20698771770 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Tue, 10 Dec 2024 12:48:56 +0000 Subject: [PATCH 1/3] feat: Reword log message around unsent spans --- packages/node/test/integration/transactions.test.ts | 2 +- packages/opentelemetry/src/spanExporter.ts | 4 +++- packages/opentelemetry/test/integration/transactions.test.ts | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/node/test/integration/transactions.test.ts b/packages/node/test/integration/transactions.test.ts index 443590601281..c571caf5fc58 100644 --- a/packages/node/test/integration/transactions.test.ts +++ b/packages/node/test/integration/transactions.test.ts @@ -620,7 +620,7 @@ describe('Integration | Transactions', () => { expect(logs).toEqual( expect.arrayContaining([ 'SpanExporter dropped 2 spans because they were pending for more than 300 seconds.', - 'SpanExporter exported 1 spans, 0 unsent spans remaining', + 'SpanExporter exported 1 spans, 0 spans are waiting for their root span to finish', ]), ); }); diff --git a/packages/opentelemetry/src/spanExporter.ts b/packages/opentelemetry/src/spanExporter.ts index ad044372e0df..85364a030ade 100644 --- a/packages/opentelemetry/src/spanExporter.ts +++ b/packages/opentelemetry/src/spanExporter.ts @@ -133,7 +133,9 @@ export class SentrySpanExporter { const remainingOpenSpanCount = finishedSpans.length - sentSpanCount; DEBUG_BUILD && - logger.log(`SpanExporter exported ${sentSpanCount} spans, ${remainingOpenSpanCount} unsent spans remaining`); + logger.log( + `SpanExporter exported ${sentSpanCount} spans, ${remainingOpenSpanCount} spans are waiting for their root span to finish`, + ); sentSpans.forEach(span => { const bucketEntry = this._spansToBucketEntry.get(span); diff --git a/packages/opentelemetry/test/integration/transactions.test.ts b/packages/opentelemetry/test/integration/transactions.test.ts index bc0179b55e38..c94dfe129df0 100644 --- a/packages/opentelemetry/test/integration/transactions.test.ts +++ b/packages/opentelemetry/test/integration/transactions.test.ts @@ -500,7 +500,7 @@ describe('Integration | Transactions', () => { expect(logs).toEqual( expect.arrayContaining([ 'SpanExporter dropped 2 spans because they were pending for more than 300 seconds.', - 'SpanExporter exported 1 spans, 0 unsent spans remaining', + 'SpanExporter exported 1 spans, 0 spans are waiting for their root span to finish', ]), ); }); From ed961475d0cc0d0f9ef231dfe93d0a353380080a Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Wed, 11 Dec 2024 10:56:41 +0100 Subject: [PATCH 2/3] Update packages/opentelemetry/src/spanExporter.ts Co-authored-by: Francesco Gringl-Novy --- packages/opentelemetry/src/spanExporter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/opentelemetry/src/spanExporter.ts b/packages/opentelemetry/src/spanExporter.ts index 85364a030ade..8ccb0a6421cb 100644 --- a/packages/opentelemetry/src/spanExporter.ts +++ b/packages/opentelemetry/src/spanExporter.ts @@ -134,7 +134,7 @@ export class SentrySpanExporter { DEBUG_BUILD && logger.log( - `SpanExporter exported ${sentSpanCount} spans, ${remainingOpenSpanCount} spans are waiting for their root span to finish`, + `SpanExporter exported ${sentSpanCount} spans, ${remainingOpenSpanCount} spans are waiting for their parent spans to finish`, ); sentSpans.forEach(span => { From 1998b8f9485895d8a52d501be3db26408191ca8b Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Wed, 11 Dec 2024 11:31:06 +0000 Subject: [PATCH 3/3] fix tests --- packages/node/test/integration/transactions.test.ts | 2 +- packages/opentelemetry/test/integration/transactions.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/node/test/integration/transactions.test.ts b/packages/node/test/integration/transactions.test.ts index c571caf5fc58..a54d3c5f73bb 100644 --- a/packages/node/test/integration/transactions.test.ts +++ b/packages/node/test/integration/transactions.test.ts @@ -620,7 +620,7 @@ describe('Integration | Transactions', () => { expect(logs).toEqual( expect.arrayContaining([ 'SpanExporter dropped 2 spans because they were pending for more than 300 seconds.', - 'SpanExporter exported 1 spans, 0 spans are waiting for their root span to finish', + 'SpanExporter exported 1 spans, 0 spans are waiting for their parent spans to finish', ]), ); }); diff --git a/packages/opentelemetry/test/integration/transactions.test.ts b/packages/opentelemetry/test/integration/transactions.test.ts index c94dfe129df0..d225fb1a0194 100644 --- a/packages/opentelemetry/test/integration/transactions.test.ts +++ b/packages/opentelemetry/test/integration/transactions.test.ts @@ -500,7 +500,7 @@ describe('Integration | Transactions', () => { expect(logs).toEqual( expect.arrayContaining([ 'SpanExporter dropped 2 spans because they were pending for more than 300 seconds.', - 'SpanExporter exported 1 spans, 0 spans are waiting for their root span to finish', + 'SpanExporter exported 1 spans, 0 spans are waiting for their parent spans to finish', ]), ); });