Skip to content

Commit 9c159b2

Browse files
committed
s/v2/streamed
1 parent b4b9baf commit 9c159b2

4 files changed

Lines changed: 24 additions & 24 deletions

File tree

packages/core/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ export type {
384384
ProfileChunkEnvelope,
385385
ProfileChunkItem,
386386
SpanEnvelope,
387-
SpanV2Envelope,
387+
StreamedSpanEnvelope,
388388
SpanItem,
389389
LogEnvelope,
390390
MetricEnvelope,

packages/core/src/tracing/spans/envelope.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
import type { Client } from '../../client';
2-
import type { DynamicSamplingContext, SpanContainerItem, SpanV2Envelope } from '../../types-hoist/envelope';
2+
import type { DynamicSamplingContext, SpanContainerItem, StreamedSpanEnvelope } from '../../types-hoist/envelope';
33
import type { SerializedSpan } from '../../types-hoist/span';
44
import { dsnToString } from '../../utils/dsn';
55
import { createEnvelope } from '../../utils/envelope';
66

77
/**
88
* Creates a span v2 span streaming envelope
99
*/
10-
export function createSpanV2Envelope(
10+
export function createStreamedSpanEnvelope(
1111
serializedSpans: Array<SerializedSpan>,
1212
dsc: Partial<DynamicSamplingContext>,
1313
client: Client,
14-
): SpanV2Envelope {
14+
): StreamedSpanEnvelope {
1515
const dsn = client.getDsn();
1616
const tunnel = client.getOptions().tunnel;
1717
const sdk = client.getOptions()._metadata?.sdk;
1818

19-
const headers: SpanV2Envelope[0] = {
19+
const headers: StreamedSpanEnvelope[0] = {
2020
sent_at: new Date().toISOString(),
2121
...(dscHasRequiredProps(dsc) && { trace: dsc }),
2222
...(sdk && { sdk }),
@@ -28,7 +28,7 @@ export function createSpanV2Envelope(
2828
{ items: serializedSpans },
2929
];
3030

31-
return createEnvelope<SpanV2Envelope>(headers, [spanContainer]);
31+
return createEnvelope<StreamedSpanEnvelope>(headers, [spanContainer]);
3232
}
3333

3434
function dscHasRequiredProps(dsc: Partial<DynamicSamplingContext>): dsc is DynamicSamplingContext {

packages/core/src/types-hoist/envelope.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ type CheckInEnvelopeHeaders = { trace?: DynamicSamplingContext };
149149
type ClientReportEnvelopeHeaders = BaseEnvelopeHeaders;
150150
type ReplayEnvelopeHeaders = BaseEnvelopeHeaders;
151151
type SpanEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
152-
type SpanV2EnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
152+
type StreamedSpanEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
153153
type LogEnvelopeHeaders = BaseEnvelopeHeaders;
154154
type MetricEnvelopeHeaders = BaseEnvelopeHeaders;
155155
export type EventEnvelope = BaseEnvelope<
@@ -161,7 +161,7 @@ export type ClientReportEnvelope = BaseEnvelope<ClientReportEnvelopeHeaders, Cli
161161
export type ReplayEnvelope = [ReplayEnvelopeHeaders, [ReplayEventItem, ReplayRecordingItem]];
162162
export type CheckInEnvelope = BaseEnvelope<CheckInEnvelopeHeaders, CheckInItem>;
163163
export type SpanEnvelope = BaseEnvelope<SpanEnvelopeHeaders, SpanItem>;
164-
export type SpanV2Envelope = BaseEnvelope<SpanV2EnvelopeHeaders, SpanContainerItem>;
164+
export type StreamedSpanEnvelope = BaseEnvelope<StreamedSpanEnvelopeHeaders, SpanContainerItem>;
165165
export type ProfileChunkEnvelope = BaseEnvelope<BaseEnvelopeHeaders, ProfileChunkItem>;
166166
export type RawSecurityEnvelope = BaseEnvelope<BaseEnvelopeHeaders, RawSecurityItem>;
167167
export type LogEnvelope = BaseEnvelope<LogEnvelopeHeaders, LogContainerItem>;
@@ -175,7 +175,7 @@ export type Envelope =
175175
| ReplayEnvelope
176176
| CheckInEnvelope
177177
| SpanEnvelope
178-
| SpanV2Envelope
178+
| StreamedSpanEnvelope
179179
| RawSecurityEnvelope
180180
| LogEnvelope
181181
| MetricEnvelope;

packages/core/test/lib/tracing/spans/envelope.test.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { describe, expect, it } from 'vitest';
2-
import { createSpanV2Envelope } from '../../../../src/tracing/spans/envelope';
2+
import { createStreamedSpanEnvelope } from '../../../../src/tracing/spans/envelope';
33
import type { DynamicSamplingContext } from '../../../../src/types-hoist/envelope';
44
import type { SerializedSpan } from '../../../../src/types-hoist/span';
55
import { getDefaultTestClientOptions, TestClient } from '../../../mocks/client';
@@ -17,14 +17,14 @@ function createMockSerializedSpan(overrides: Partial<SerializedSpan> = {}): Seri
1717
};
1818
}
1919

20-
describe('createSpanV2Envelope', () => {
20+
describe('createStreamedSpanEnvelope', () => {
2121
describe('envelope headers', () => {
2222
it('creates an envelope with sent_at header', () => {
2323
const mockSpan = createMockSerializedSpan();
2424
const mockClient = new TestClient(getDefaultTestClientOptions());
2525
const dsc: Partial<DynamicSamplingContext> = {};
2626

27-
const result = createSpanV2Envelope([mockSpan], dsc, mockClient);
27+
const result = createStreamedSpanEnvelope([mockSpan], dsc, mockClient);
2828

2929
expect(result[0]).toHaveProperty('sent_at', expect.any(String));
3030
});
@@ -39,7 +39,7 @@ describe('createSpanV2Envelope', () => {
3939
release: 'v1.0.0',
4040
};
4141

42-
const result = createSpanV2Envelope([mockSpan], dsc, mockClient);
42+
const result = createStreamedSpanEnvelope([mockSpan], dsc, mockClient);
4343

4444
expect(result[0]).toHaveProperty('trace', dsc);
4545
});
@@ -51,7 +51,7 @@ describe('createSpanV2Envelope', () => {
5151
public_key: 'public-key-abc',
5252
};
5353

54-
const result = createSpanV2Envelope([mockSpan], dsc, mockClient);
54+
const result = createStreamedSpanEnvelope([mockSpan], dsc, mockClient);
5555

5656
expect(result[0]).not.toHaveProperty('trace');
5757
});
@@ -63,7 +63,7 @@ describe('createSpanV2Envelope', () => {
6363
trace_id: 'trace-123',
6464
};
6565

66-
const result = createSpanV2Envelope([mockSpan], dsc, mockClient);
66+
const result = createStreamedSpanEnvelope([mockSpan], dsc, mockClient);
6767

6868
expect(result[0]).not.toHaveProperty('trace');
6969
});
@@ -79,7 +79,7 @@ describe('createSpanV2Envelope', () => {
7979
);
8080
const dsc: Partial<DynamicSamplingContext> = {};
8181

82-
const result = createSpanV2Envelope([mockSpan], dsc, mockClient);
82+
const result = createStreamedSpanEnvelope([mockSpan], dsc, mockClient);
8383

8484
expect(result[0]).toHaveProperty('sdk', { name: 'sentry.javascript.browser', version: '8.0.0' });
8585
});
@@ -89,7 +89,7 @@ describe('createSpanV2Envelope', () => {
8989
const mockClient = new TestClient(getDefaultTestClientOptions());
9090
const dsc: Partial<DynamicSamplingContext> = {};
9191

92-
const result = createSpanV2Envelope([mockSpan], dsc, mockClient);
92+
const result = createStreamedSpanEnvelope([mockSpan], dsc, mockClient);
9393

9494
expect(result[0]).not.toHaveProperty('sdk');
9595
});
@@ -104,7 +104,7 @@ describe('createSpanV2Envelope', () => {
104104
);
105105
const dsc: Partial<DynamicSamplingContext> = {};
106106

107-
const result = createSpanV2Envelope([mockSpan], dsc, mockClient);
107+
const result = createStreamedSpanEnvelope([mockSpan], dsc, mockClient);
108108

109109
expect(result[0]).toHaveProperty('dsn', 'https://abc123@example.sentry.io/456');
110110
});
@@ -118,7 +118,7 @@ describe('createSpanV2Envelope', () => {
118118
);
119119
const dsc: Partial<DynamicSamplingContext> = {};
120120

121-
const result = createSpanV2Envelope([mockSpan], dsc, mockClient);
121+
const result = createStreamedSpanEnvelope([mockSpan], dsc, mockClient);
122122

123123
expect(result[0]).not.toHaveProperty('dsn');
124124
});
@@ -132,7 +132,7 @@ describe('createSpanV2Envelope', () => {
132132
);
133133
const dsc: Partial<DynamicSamplingContext> = {};
134134

135-
const result = createSpanV2Envelope([mockSpan], dsc, mockClient);
135+
const result = createStreamedSpanEnvelope([mockSpan], dsc, mockClient);
136136

137137
expect(result[0]).not.toHaveProperty('dsn');
138138
});
@@ -154,7 +154,7 @@ describe('createSpanV2Envelope', () => {
154154
environment: 'production',
155155
};
156156

157-
const result = createSpanV2Envelope([mockSpan], dsc, mockClient);
157+
const result = createStreamedSpanEnvelope([mockSpan], dsc, mockClient);
158158

159159
expect(result[0]).toEqual({
160160
sent_at: expect.any(String),
@@ -171,7 +171,7 @@ describe('createSpanV2Envelope', () => {
171171
const mockClient = new TestClient(getDefaultTestClientOptions());
172172
const dsc: Partial<DynamicSamplingContext> = {};
173173

174-
const envelopeItems = createSpanV2Envelope([mockSpan], dsc, mockClient)[1];
174+
const envelopeItems = createStreamedSpanEnvelope([mockSpan], dsc, mockClient)[1];
175175

176176
expect(envelopeItems).toEqual([
177177
[
@@ -194,7 +194,7 @@ describe('createSpanV2Envelope', () => {
194194
const mockClient = new TestClient(getDefaultTestClientOptions());
195195
const dsc: Partial<DynamicSamplingContext> = {};
196196

197-
const envelopeItems = createSpanV2Envelope([mockSpan1, mockSpan2, mockSpan3], dsc, mockClient)[1];
197+
const envelopeItems = createStreamedSpanEnvelope([mockSpan1, mockSpan2, mockSpan3], dsc, mockClient)[1];
198198

199199
expect(envelopeItems).toEqual([
200200
[
@@ -208,7 +208,7 @@ describe('createSpanV2Envelope', () => {
208208
const mockClient = new TestClient(getDefaultTestClientOptions());
209209
const dsc: Partial<DynamicSamplingContext> = {};
210210

211-
const result = createSpanV2Envelope([], dsc, mockClient);
211+
const result = createStreamedSpanEnvelope([], dsc, mockClient);
212212

213213
expect(result).toEqual([
214214
{

0 commit comments

Comments
 (0)