Skip to content

Commit a48e212

Browse files
committed
chore: fixes
1 parent d2129c5 commit a48e212

2 files changed

Lines changed: 18 additions & 10 deletions

File tree

packages/collector/test/integration/misc/specification_compliance/test_base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ module.exports = function () {
138138

139139
headers = { ...headers, ...parseHeaderList(testDefinition['request headers in']) };
140140

141-
const suppressed = testDefinition['X-INSTANA-L in'] === '0' || testDefinition['Server-Timing'] === null;
141+
const suppressed = testDefinition.suppressed === true;
142142

143143
const basePath = '/start';
144144
const query = testDefinition['query in'];

packages/collector/test/integration/misc/specification_compliance/tracer_compliance_test_cases.json

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -231,35 +231,39 @@
231231
},
232232
{
233233
"Scenario": "only X-INSTANA-L=0",
234-
"What to do?": "Dont create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
234+
"What to do?": "Don't create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
235235
"X-INSTANA-L in": "0",
236+
"suppressed": true,
236237
"X-INSTANA-L out": "0",
237238
"traceparent out": "00-0000000000000000$new_64_bit_trace_id-$new_span_id-02",
238239
"index": 12
239240
},
240241
{
241242
"Scenario": "X-INSTANA-L=0 plus -T and -S",
242-
"What to do?": "Dont create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
243+
"What to do?": "Don't create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
243244
"X-INSTANA-T in": "fa2375d711a4ca0f",
244245
"X-INSTANA-S in": "37cb2d6e9b1c078a",
245246
"X-INSTANA-L in": "0",
247+
"suppressed": true,
246248
"X-INSTANA-L out": "0",
247249
"traceparent out": "00-0000000000000000$new_64_bit_trace_id-$new_span_id-02",
248250
"index": 13
249251
},
250252
{
251253
"Scenario": "X-INSTANA-L=0 plus traceparent",
252-
"What to do?": "Dont create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
254+
"What to do?": "Don't create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
253255
"X-INSTANA-L in": "0",
256+
"suppressed": true,
254257
"traceparent in": "00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-01",
255258
"X-INSTANA-L out": "0",
256259
"traceparent out": "00-0af7651916cd43dd8448eb211c80319c-$new_span_id-00",
257260
"index": 14
258261
},
259262
{
260263
"Scenario": "X-INSTANA-L=0 plus traceparent and tracestate",
261-
"What to do?": "Dont create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
264+
"What to do?": "Don't create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
262265
"X-INSTANA-L in": "0",
266+
"suppressed": true,
263267
"traceparent in": "00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-01",
264268
"tracestate in": "congo=ucfJifl5GOE,rojo=00f067aa0ba902b7",
265269
"X-INSTANA-L out": "0",
@@ -515,39 +519,43 @@
515519
},
516520
{
517521
"Scenario": "w3c off, only X-INSTANA-L=0",
518-
"What to do?": "Dont create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
522+
"What to do?": "Don't create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
519523
"INSTANA_DISABLE_W3C_TRACE_CORRELATION": "yes_please",
520524
"X-INSTANA-L in": "0",
525+
"suppressed": true,
521526
"X-INSTANA-L out": "0",
522527
"traceparent out": "00-0000000000000000$new_64_bit_trace_id-$new_span_id-02",
523528
"index": 28
524529
},
525530
{
526531
"Scenario": "w3c off, X-INSTANA-L=0 plus -T and -S",
527-
"What to do?": "Dont create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
532+
"What to do?": "Don't create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
528533
"INSTANA_DISABLE_W3C_TRACE_CORRELATION": "w3c_trace_correlation_stinks",
529534
"X-INSTANA-T in": "fa2375d711a4ca0f",
530535
"X-INSTANA-S in": "37cb2d6e9b1c078a",
531536
"X-INSTANA-L in": "0",
537+
"suppressed": true,
532538
"X-INSTANA-L out": "0",
533539
"traceparent out": "00-0000000000000000$new_64_bit_trace_id-$new_span_id-02",
534540
"index": 29
535541
},
536542
{
537543
"Scenario": "w3c off, X-INSTANA-L=0 plus traceparent",
538-
"What to do?": "Dont create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
544+
"What to do?": "Don't create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
539545
"INSTANA_DISABLE_W3C_TRACE_CORRELATION": "true",
540546
"X-INSTANA-L in": "0",
547+
"suppressed": true,
541548
"traceparent in": "00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-01",
542549
"X-INSTANA-L out": "0",
543550
"traceparent out": "00-0af7651916cd43dd8448eb211c80319c-$new_span_id-00",
544551
"index": 30
545552
},
546553
{
547554
"Scenario": "w3c off, X-INSTANA-L=0 plus traceparent and tracestate",
548-
"What to do?": "Dont create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
555+
"What to do?": "Don't create spans, send X-INSTANA-L=0 and spec headers downstream with sampled=0",
549556
"INSTANA_DISABLE_W3C_TRACE_CORRELATION": "yes",
550557
"X-INSTANA-L in": "0",
558+
"suppressed": true,
551559
"traceparent in": "00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-01",
552560
"tracestate in": "congo=ucfJifl5GOE,rojo=00f067aa0ba902b7",
553561
"X-INSTANA-L out": "0",
@@ -593,7 +601,7 @@
593601
"Scenario": "traceparent but no tracestate, sampled flag is 0",
594602
"What to do?": "Respect the sampled=0 flag, suppress tracing, pass sampled=0 downstream",
595603
"traceparent in": "00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-00",
596-
"Server-Timing": null,
604+
"suppressed": true,
597605
"X-INSTANA-L out": "0",
598606
"traceparent out": "00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-00",
599607
"index": 34

0 commit comments

Comments
 (0)