Skip to content

Commit d2129c5

Browse files
committed
chore: fixes
1 parent 938c8bf commit d2129c5

2 files changed

Lines changed: 6 additions & 17 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';
141+
const suppressed = testDefinition['X-INSTANA-L in'] === '0' || testDefinition['Server-Timing'] === null;
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: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -591,22 +591,11 @@
591591
},
592592
{
593593
"Scenario": "traceparent but no tracestate, sampled flag is 0",
594-
"What to do?": "Ignore the sampled flag, continue the trace from traceparent, set span.lt and span.tp, but not span.ia",
594+
"What to do?": "Respect the sampled=0 flag, suppress tracing, pass sampled=0 downstream",
595595
"traceparent in": "00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-00",
596-
"Server-Timing": "intid;desc=8448eb211c80319c",
597-
"entrySpan.t": "8448eb211c80319c",
598-
"entrySpan.p": "b9c7c989f97918e1",
599-
"entrySpan.s": "$new_span_id_1",
600-
"entrySpan.tp": true,
601-
"entrySpan.lt": "0af7651916cd43dd8448eb211c80319c",
602-
"exitSpan.t": "8448eb211c80319c",
603-
"exitSpan.p": "$new_span_id_1",
604-
"exitSpan.s": "$new_span_id_2",
605-
"X-INSTANA-T out": "8448eb211c80319c",
606-
"X-INSTANA-S out": "$new_span_id_2",
607-
"X-INSTANA-L out": "1",
608-
"traceparent out": "00-0af7651916cd43dd8448eb211c80319c-$new_span_id_2-01",
609-
"tracestate out": "in=8448eb211c80319c;$new_span_id_2",
596+
"Server-Timing": null,
597+
"X-INSTANA-L out": "0",
598+
"traceparent out": "00-0af7651916cd43dd8448eb211c80319c-b9c7c989f97918e1-00",
610599
"index": 34
611600
},
612601
{
@@ -774,4 +763,4 @@
774763
"tracestate out": "in=fa2375d711a4ca0f;$new_span_id_2",
775764
"index": 42
776765
}
777-
]
766+
]

0 commit comments

Comments
 (0)