@@ -10,9 +10,13 @@ describe('express sentry-trace', () => {
1010 } ) ;
1111
1212 createCjsTests ( __dirname , 'scenario.mjs' , 'instrument.mjs' , ( createRunner , test ) => {
13+ let started : ReturnType < ReturnType < typeof createRunner > [ 'start' ] > | undefined ;
14+ // These cases vary request headers, so the same initialized server can handle each one.
15+ const getRunner = ( ) => ( started ??= createRunner ( ) . start ( ) ) ;
16+
1317 describe ( 'baggage header assignment' , ( ) => {
1418 test ( 'Should overwrite baggage if the incoming request already has Sentry baggage data but no sentry-trace' , async ( ) => {
15- const runner = createRunner ( ) . start ( ) ;
19+ const runner = getRunner ( ) ;
1620
1721 const response = await runner . makeRequest < TestAPIResponse > ( 'get' , '/test/express' , {
1822 headers : {
@@ -30,7 +34,7 @@ describe('express sentry-trace', () => {
3034 } ) ;
3135
3236 test ( 'Should propagate sentry trace baggage data from an incoming to an outgoing request.' , async ( ) => {
33- const runner = createRunner ( ) . start ( ) ;
37+ const runner = getRunner ( ) ;
3438
3539 const response = await runner . makeRequest < TestAPIResponse > ( 'get' , '/test/express' , {
3640 headers : {
@@ -49,7 +53,7 @@ describe('express sentry-trace', () => {
4953 } ) ;
5054
5155 test ( 'Should not propagate baggage data from an incoming to an outgoing request if sentry-trace is faulty.' , async ( ) => {
52- const runner = createRunner ( ) . start ( ) ;
56+ const runner = getRunner ( ) ;
5357
5458 const response = await runner . makeRequest < TestAPIResponse > ( 'get' , '/test/express' , {
5559 headers : {
@@ -68,7 +72,7 @@ describe('express sentry-trace', () => {
6872 } ) ;
6973
7074 test ( 'Should not propagate baggage if sentry-trace header is present in incoming request but no baggage header' , async ( ) => {
71- const runner = createRunner ( ) . start ( ) ;
75+ const runner = getRunner ( ) ;
7276
7377 const response = await runner . makeRequest < TestAPIResponse > ( 'get' , '/test/express' , {
7478 headers : {
@@ -85,7 +89,7 @@ describe('express sentry-trace', () => {
8589 } ) ;
8690
8791 test ( 'Should not propagate baggage and ignore original 3rd party baggage entries if sentry-trace header is present' , async ( ) => {
88- const runner = createRunner ( ) . start ( ) ;
92+ const runner = getRunner ( ) ;
8993
9094 const response = await runner . makeRequest < TestAPIResponse > ( 'get' , '/test/express' , {
9195 headers : {
@@ -103,7 +107,7 @@ describe('express sentry-trace', () => {
103107 } ) ;
104108
105109 test ( 'Should populate and propagate sentry baggage if sentry-trace header does not exist' , async ( ) => {
106- const runner = createRunner ( ) . start ( ) ;
110+ const runner = getRunner ( ) ;
107111
108112 const response = await runner . makeRequest < TestAPIResponse > ( 'get' , '/test/express' ) ;
109113
@@ -126,7 +130,7 @@ describe('express sentry-trace', () => {
126130 } ) ;
127131
128132 test ( 'Should populate Sentry and ignore 3rd party content if sentry-trace header does not exist' , async ( ) => {
129- const runner = createRunner ( ) . start ( ) ;
133+ const runner = getRunner ( ) ;
130134
131135 const response = await runner . makeRequest < TestAPIResponse > ( 'get' , '/test/express' , {
132136 headers : {
@@ -153,7 +157,7 @@ describe('express sentry-trace', () => {
153157 } ) ;
154158
155159 test ( 'should attach a baggage header to an outgoing request.' , async ( ) => {
156- const runner = createRunner ( ) . start ( ) ;
160+ const runner = getRunner ( ) ;
157161
158162 const response = await runner . makeRequest < TestAPIResponse > ( 'get' , '/test/express-replace-trace-id' ) ;
159163
@@ -182,7 +186,7 @@ describe('express sentry-trace', () => {
182186 } ) ;
183187
184188 test ( 'should merge `baggage` header of a third party vendor with the Sentry DSC baggage items' , async ( ) => {
185- const runner = createRunner ( ) . start ( ) ;
189+ const runner = getRunner ( ) ;
186190
187191 const response = await runner . makeRequest < TestAPIResponse > ( 'get' , '/test/express-third-party-baggage' , {
188192 headers : {
@@ -203,7 +207,7 @@ describe('express sentry-trace', () => {
203207
204208 describe ( 'third party baggage with sentry entries' , ( ) => {
205209 test ( 'should ignore sentry-values in `baggage` header of a third party vendor and overwrite them with incoming DSC' , async ( ) => {
206- const runner = createRunner ( ) . start ( ) ;
210+ const runner = getRunner ( ) ;
207211
208212 const response = await runner . makeRequest < TestAPIResponse > (
209213 'get' ,
@@ -238,7 +242,7 @@ describe('express sentry-trace', () => {
238242 } ) ;
239243
240244 test ( 'should ignore sentry-values in `baggage` header of a third party vendor and overwrite them with new DSC' , async ( ) => {
241- const runner = createRunner ( ) . start ( ) ;
245+ const runner = getRunner ( ) ;
242246
243247 const response = await runner . makeRequest < TestAPIResponse > (
244248 'get' ,
@@ -278,7 +282,7 @@ describe('express sentry-trace', () => {
278282 } ) ;
279283
280284 test ( 'should preserve baggage property values with equal signs (W3C spec compliance)' , async ( ) => {
281- const runner = createRunner ( ) . start ( ) ;
285+ const runner = getRunner ( ) ;
282286
283287 // W3C spec example: https://www.w3.org/TR/baggage/#example
284288 const response = await runner . makeRequest < TestAPIResponse > ( 'get' , '/test/express-property-values' , {
@@ -299,7 +303,7 @@ describe('express sentry-trace', () => {
299303 } ) ;
300304
301305 test ( 'Includes transaction in baggage if the transaction name is parameterized' , async ( ) => {
302- const runner = createRunner ( ) . start ( ) ;
306+ const runner = getRunner ( ) ;
303307
304308 const response = await runner . makeRequest < TestAPIResponse > ( 'get' , '/test/express' ) ;
305309
@@ -313,7 +317,7 @@ describe('express sentry-trace', () => {
313317 } ) ;
314318
315319 test ( 'Should assign `sentry-trace` header which sets parent trace id of an outgoing request.' , async ( ) => {
316- const runner = createRunner ( ) . start ( ) ;
320+ const runner = getRunner ( ) ;
317321
318322 const response = await runner . makeRequest < TestAPIResponse > ( 'get' , '/test/express' , {
319323 headers : {
@@ -333,7 +337,7 @@ describe('express sentry-trace', () => {
333337 } ) ;
334338
335339 test ( 'should attach a `sentry-trace` header to an outgoing request.' , async ( ) => {
336- const runner = createRunner ( ) . start ( ) ;
340+ const runner = getRunner ( ) ;
337341
338342 const response = await runner . makeRequest < TestAPIResponse > ( 'get' , '/test/express' ) ;
339343
0 commit comments