From abe6ac05a48fd075bb810dc6eee298d3cbb8b464 Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 20 Mar 2025 11:08:25 -0400 Subject: [PATCH 1/5] profiling: add platform to envelope headers --- packages/profiling-node/src/integration.ts | 2 +- packages/profiling-node/src/utils.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/profiling-node/src/integration.ts b/packages/profiling-node/src/integration.ts index 35243f6da396..4b384b244a17 100644 --- a/packages/profiling-node/src/integration.ts +++ b/packages/profiling-node/src/integration.ts @@ -516,7 +516,7 @@ class ContinuousProfiler { const metadata = this._client.getSdkMetadata(); const tunnel = this._client.getOptions().tunnel; - const envelope = makeProfileChunkEnvelope(chunk, metadata?.sdk, tunnel, dsn); + const envelope = makeProfileChunkEnvelope('node', chunk, metadata?.sdk, tunnel, dsn); transport.send(envelope).then(null, reason => { DEBUG_BUILD && logger.error('Error while sending profile chunk envelope:', reason); }); diff --git a/packages/profiling-node/src/utils.ts b/packages/profiling-node/src/utils.ts index 23b05f14f67b..4e732d0232b6 100644 --- a/packages/profiling-node/src/utils.ts +++ b/packages/profiling-node/src/utils.ts @@ -400,6 +400,7 @@ export function createEventEnvelopeHeaders( * Creates a standalone profile_chunk envelope. */ export function makeProfileChunkEnvelope( + platform: 'node', chunk: ProfileChunk, sdkInfo: SdkInfo | undefined, tunnel: string | undefined, @@ -407,6 +408,7 @@ export function makeProfileChunkEnvelope( ): ProfileChunkEnvelope { const profileChunkHeader: ProfileChunkItem[0] = { type: 'profile_chunk', + platform: platform, }; return createEnvelope(createEventEnvelopeHeaders(sdkInfo, tunnel, dsn), [ From c277f677dac2c3e6bc1df4ac7e59ad9002723c82 Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 20 Mar 2025 11:10:23 -0400 Subject: [PATCH 2/5] profiling(node): add platform to profile_chunk envelope header --- packages/profiling-node/test/integration.test.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/profiling-node/test/integration.test.ts b/packages/profiling-node/test/integration.test.ts index 99142651312e..304aa6a9766b 100644 --- a/packages/profiling-node/test/integration.test.ts +++ b/packages/profiling-node/test/integration.test.ts @@ -643,7 +643,9 @@ describe('ProfilingIntegration', () => { Sentry.profiler.stopProfiler(); vi.advanceTimersByTime(1000); - expect(transportSpy.mock.calls?.[0]?.[0]?.[1]?.[0]?.[0]?.type).toBe('profile_chunk'); + const envelopeHeaders = transportSpy.mock.calls?.[0]?.[0]?.[1]?.[0]?.[0]; + expect(envelopeHeaders?.type).toBe('profile_chunk'); + expect(envelopeHeaders?.platform).toBe('node'); }); it('sets global profile context', async () => { From aa056cd77a9c43f38fae7e1d28062fb34949032e Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 20 Mar 2025 11:33:39 -0400 Subject: [PATCH 3/5] profiling(node) rename platform to javascript.node --- packages/profiling-node/src/integration.ts | 2 +- packages/profiling-node/src/utils.ts | 2 +- packages/profiling-node/test/integration.test.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/profiling-node/src/integration.ts b/packages/profiling-node/src/integration.ts index 4b384b244a17..3645aea91977 100644 --- a/packages/profiling-node/src/integration.ts +++ b/packages/profiling-node/src/integration.ts @@ -516,7 +516,7 @@ class ContinuousProfiler { const metadata = this._client.getSdkMetadata(); const tunnel = this._client.getOptions().tunnel; - const envelope = makeProfileChunkEnvelope('node', chunk, metadata?.sdk, tunnel, dsn); + const envelope = makeProfileChunkEnvelope('javascript.node', chunk, metadata?.sdk, tunnel, dsn); transport.send(envelope).then(null, reason => { DEBUG_BUILD && logger.error('Error while sending profile chunk envelope:', reason); }); diff --git a/packages/profiling-node/src/utils.ts b/packages/profiling-node/src/utils.ts index 4e732d0232b6..8ed698028c45 100644 --- a/packages/profiling-node/src/utils.ts +++ b/packages/profiling-node/src/utils.ts @@ -400,7 +400,7 @@ export function createEventEnvelopeHeaders( * Creates a standalone profile_chunk envelope. */ export function makeProfileChunkEnvelope( - platform: 'node', + platform: 'javascript.node', chunk: ProfileChunk, sdkInfo: SdkInfo | undefined, tunnel: string | undefined, diff --git a/packages/profiling-node/test/integration.test.ts b/packages/profiling-node/test/integration.test.ts index 304aa6a9766b..6574cd3b01bd 100644 --- a/packages/profiling-node/test/integration.test.ts +++ b/packages/profiling-node/test/integration.test.ts @@ -645,7 +645,7 @@ describe('ProfilingIntegration', () => { const envelopeHeaders = transportSpy.mock.calls?.[0]?.[0]?.[1]?.[0]?.[0]; expect(envelopeHeaders?.type).toBe('profile_chunk'); - expect(envelopeHeaders?.platform).toBe('node'); + expect(envelopeHeaders?.platform).toBe('javascript.node'); }); it('sets global profile context', async () => { From 7038c24a939507c28745899589b732f9844b70c9 Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 20 Mar 2025 11:43:13 -0400 Subject: [PATCH 4/5] Revert "profiling(node) rename platform to javascript.node" This reverts commit aa056cd77a9c43f38fae7e1d28062fb34949032e. --- packages/profiling-node/src/integration.ts | 2 +- packages/profiling-node/src/utils.ts | 2 +- packages/profiling-node/test/integration.test.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/profiling-node/src/integration.ts b/packages/profiling-node/src/integration.ts index 3645aea91977..4b384b244a17 100644 --- a/packages/profiling-node/src/integration.ts +++ b/packages/profiling-node/src/integration.ts @@ -516,7 +516,7 @@ class ContinuousProfiler { const metadata = this._client.getSdkMetadata(); const tunnel = this._client.getOptions().tunnel; - const envelope = makeProfileChunkEnvelope('javascript.node', chunk, metadata?.sdk, tunnel, dsn); + const envelope = makeProfileChunkEnvelope('node', chunk, metadata?.sdk, tunnel, dsn); transport.send(envelope).then(null, reason => { DEBUG_BUILD && logger.error('Error while sending profile chunk envelope:', reason); }); diff --git a/packages/profiling-node/src/utils.ts b/packages/profiling-node/src/utils.ts index 8ed698028c45..4e732d0232b6 100644 --- a/packages/profiling-node/src/utils.ts +++ b/packages/profiling-node/src/utils.ts @@ -400,7 +400,7 @@ export function createEventEnvelopeHeaders( * Creates a standalone profile_chunk envelope. */ export function makeProfileChunkEnvelope( - platform: 'javascript.node', + platform: 'node', chunk: ProfileChunk, sdkInfo: SdkInfo | undefined, tunnel: string | undefined, diff --git a/packages/profiling-node/test/integration.test.ts b/packages/profiling-node/test/integration.test.ts index 6574cd3b01bd..304aa6a9766b 100644 --- a/packages/profiling-node/test/integration.test.ts +++ b/packages/profiling-node/test/integration.test.ts @@ -645,7 +645,7 @@ describe('ProfilingIntegration', () => { const envelopeHeaders = transportSpy.mock.calls?.[0]?.[0]?.[1]?.[0]?.[0]; expect(envelopeHeaders?.type).toBe('profile_chunk'); - expect(envelopeHeaders?.platform).toBe('javascript.node'); + expect(envelopeHeaders?.platform).toBe('node'); }); it('sets global profile context', async () => { From 146aa1ce28ff6b85dd6979357594fd684e8d4f61 Mon Sep 17 00:00:00 2001 From: JonasBa Date: Thu, 20 Mar 2025 11:55:28 -0400 Subject: [PATCH 5/5] profiling(node) obj shorthand --- packages/profiling-node/src/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/profiling-node/src/utils.ts b/packages/profiling-node/src/utils.ts index 4e732d0232b6..2de8e54208db 100644 --- a/packages/profiling-node/src/utils.ts +++ b/packages/profiling-node/src/utils.ts @@ -408,7 +408,7 @@ export function makeProfileChunkEnvelope( ): ProfileChunkEnvelope { const profileChunkHeader: ProfileChunkItem[0] = { type: 'profile_chunk', - platform: platform, + platform, }; return createEnvelope(createEventEnvelopeHeaders(sdkInfo, tunnel, dsn), [