Skip to content

Commit ae0456a

Browse files
nikita-tkachenko-datadognikita-tkachenko-datadog
committed
Do not propagate suppressed test failures to parent spans
1 parent 5d9d476 commit ae0456a

68 files changed

Lines changed: 211 additions & 215 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/SpanTagsPropagator.java‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -136,23 +136,19 @@ private void unsafePropagateStatus(AgentSpan childSpan) {
136136
return;
137137
}
138138

139+
Boolean childFailureSuppressed = (Boolean) childSpan.getTag(Tags.TEST_FAILURE_SUPPRESSED);
139140
TestStatus parentStatus = (TestStatus) parentSpan.getTag(Tags.TEST_STATUS);
140-
switch (childStatus) {
141-
case pass:
142-
if (parentStatus == null || TestStatus.skip.equals(parentStatus)) {
143-
parentSpan.setTag(Tags.TEST_STATUS, TestStatus.pass);
144-
}
145-
break;
146-
case fail:
147-
parentSpan.setTag(Tags.TEST_STATUS, TestStatus.fail);
148-
break;
149-
case skip:
150-
if (parentStatus == null) {
151-
parentSpan.setTag(Tags.TEST_STATUS, TestStatus.skip);
152-
}
153-
break;
154-
default:
155-
break;
141+
if (childStatus == TestStatus.pass
142+
|| (childFailureSuppressed != null && childFailureSuppressed)) {
143+
if (parentStatus == null || TestStatus.skip.equals(parentStatus)) {
144+
parentSpan.setTag(Tags.TEST_STATUS, TestStatus.pass);
145+
}
146+
} else if (childStatus == TestStatus.fail) {
147+
parentSpan.setTag(Tags.TEST_STATUS, TestStatus.fail);
148+
} else if (childStatus == TestStatus.skip) {
149+
if (parentStatus == null) {
150+
parentSpan.setTag(Tags.TEST_STATUS, TestStatus.skip);
151+
}
156152
}
157153
}
158154

‎dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"test.framework" : "cucumber",
1313
"test.framework_version" : ${content_meta_test_framework_version},
1414
"test.module" : "cucumber-junit-4",
15-
"test.status" : "fail",
15+
"test.status" : "pass",
1616
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
1717
"test.type" : "test",
1818
"test_session.name" : "session-name"
@@ -303,7 +303,7 @@
303303
"test.command" : "cucumber-junit-4",
304304
"test.framework" : "cucumber",
305305
"test.framework_version" : ${content_meta_test_framework_version},
306-
"test.status" : "fail",
306+
"test.status" : "pass",
307307
"test.test_management.enabled" : "true",
308308
"test.type" : "test",
309309
"test_session.name" : "session-name"
@@ -336,7 +336,7 @@
336336
"test.framework" : "cucumber",
337337
"test.framework_version" : ${content_meta_test_framework_version},
338338
"test.module" : "cucumber-junit-4",
339-
"test.status" : "fail",
339+
"test.status" : "pass",
340340
"test.test_management.enabled" : "true",
341341
"test.type" : "test",
342342
"test_session.name" : "session-name"

‎dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"test.framework" : "cucumber",
1313
"test.framework_version" : ${content_meta_test_framework_version},
1414
"test.module" : "cucumber-junit-4",
15-
"test.status" : "fail",
15+
"test.status" : "pass",
1616
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
1717
"test.type" : "test",
1818
"test_session.name" : "session-name"
@@ -303,7 +303,7 @@
303303
"test.command" : "cucumber-junit-4",
304304
"test.framework" : "cucumber",
305305
"test.framework_version" : ${content_meta_test_framework_version},
306-
"test.status" : "fail",
306+
"test.status" : "pass",
307307
"test.test_management.enabled" : "true",
308308
"test.type" : "test",
309309
"test_session.name" : "session-name"
@@ -336,7 +336,7 @@
336336
"test.framework" : "cucumber",
337337
"test.framework_version" : ${content_meta_test_framework_version},
338338
"test.module" : "cucumber-junit-4",
339-
"test.status" : "fail",
339+
"test.status" : "pass",
340340
"test.test_management.enabled" : "true",
341341
"test.type" : "test",
342342
"test_session.name" : "session-name"

‎dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"test.framework" : "cucumber",
1313
"test.framework_version" : ${content_meta_test_framework_version},
1414
"test.module" : "cucumber-junit-4",
15-
"test.status" : "fail",
15+
"test.status" : "pass",
1616
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
1717
"test.type" : "test",
1818
"test_session.name" : "session-name"
@@ -297,7 +297,7 @@
297297
"test.command" : "cucumber-junit-4",
298298
"test.framework" : "cucumber",
299299
"test.framework_version" : ${content_meta_test_framework_version},
300-
"test.status" : "fail",
300+
"test.status" : "pass",
301301
"test.test_management.enabled" : "true",
302302
"test.type" : "test",
303303
"test_session.name" : "session-name"
@@ -330,7 +330,7 @@
330330
"test.framework" : "cucumber",
331331
"test.framework_version" : ${content_meta_test_framework_version},
332332
"test.module" : "cucumber-junit-4",
333-
"test.status" : "fail",
333+
"test.status" : "pass",
334334
"test.test_management.enabled" : "true",
335335
"test.type" : "test",
336336
"test_session.name" : "session-name"

‎dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"test.framework" : "cucumber",
1313
"test.framework_version" : ${content_meta_test_framework_version},
1414
"test.module" : "cucumber-junit-4",
15-
"test.status" : "fail",
15+
"test.status" : "pass",
1616
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
1717
"test.type" : "test",
1818
"test_session.name" : "session-name"
@@ -201,7 +201,7 @@
201201
"test.early_flake.enabled" : "true",
202202
"test.framework" : "cucumber",
203203
"test.framework_version" : ${content_meta_test_framework_version},
204-
"test.status" : "fail",
204+
"test.status" : "pass",
205205
"test.test_management.enabled" : "true",
206206
"test.type" : "test",
207207
"test_session.name" : "session-name"
@@ -235,7 +235,7 @@
235235
"test.framework" : "cucumber",
236236
"test.framework_version" : ${content_meta_test_framework_version},
237237
"test.module" : "cucumber-junit-4",
238-
"test.status" : "fail",
238+
"test.status" : "pass",
239239
"test.test_management.enabled" : "true",
240240
"test.type" : "test",
241241
"test_session.name" : "session-name"

‎dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"test.framework" : "cucumber",
1313
"test.framework_version" : ${content_meta_test_framework_version},
1414
"test.module" : "cucumber-junit-4",
15-
"test.status" : "fail",
15+
"test.status" : "pass",
1616
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
1717
"test.type" : "test",
1818
"test_session.name" : "session-name"
@@ -97,7 +97,7 @@
9797
"test.early_flake.enabled" : "true",
9898
"test.framework" : "cucumber",
9999
"test.framework_version" : ${content_meta_test_framework_version},
100-
"test.status" : "fail",
100+
"test.status" : "pass",
101101
"test.test_management.enabled" : "true",
102102
"test.type" : "test",
103103
"test_session.name" : "session-name"
@@ -131,7 +131,7 @@
131131
"test.framework" : "cucumber",
132132
"test.framework_version" : ${content_meta_test_framework_version},
133133
"test.module" : "cucumber-junit-4",
134-
"test.status" : "fail",
134+
"test.status" : "pass",
135135
"test.test_management.enabled" : "true",
136136
"test.type" : "test",
137137
"test_session.name" : "session-name"

‎dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"test.framework" : "cucumber",
1313
"test.framework_version" : ${content_meta_test_framework_version},
1414
"test.module" : "cucumber-junit-4",
15-
"test.status" : "fail",
15+
"test.status" : "pass",
1616
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
1717
"test.type" : "test",
1818
"test_session.name" : "session-name"
@@ -96,7 +96,7 @@
9696
"test.command" : "cucumber-junit-4",
9797
"test.framework" : "cucumber",
9898
"test.framework_version" : ${content_meta_test_framework_version},
99-
"test.status" : "fail",
99+
"test.status" : "pass",
100100
"test.test_management.enabled" : "true",
101101
"test.type" : "test",
102102
"test_session.name" : "session-name"
@@ -129,7 +129,7 @@
129129
"test.framework" : "cucumber",
130130
"test.framework_version" : ${content_meta_test_framework_version},
131131
"test.module" : "cucumber-junit-4",
132-
"test.status" : "fail",
132+
"test.status" : "pass",
133133
"test.test_management.enabled" : "true",
134134
"test.type" : "test",
135135
"test_session.name" : "session-name"

‎dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"test.command" : "munit-junit-4",
1717
"test.framework" : "munit",
1818
"test.framework_version" : ${content_meta_test_framework_version},
19-
"test.status" : "fail",
19+
"test.status" : "pass",
2020
"test.test_management.enabled" : "true",
2121
"test.type" : "test",
2222
"test_session.name" : "session-name"
@@ -49,7 +49,7 @@
4949
"test.framework" : "munit",
5050
"test.framework_version" : ${content_meta_test_framework_version},
5151
"test.module" : "munit-junit-4",
52-
"test.status" : "fail",
52+
"test.status" : "pass",
5353
"test.test_management.enabled" : "true",
5454
"test.type" : "test",
5555
"test_session.name" : "session-name"
@@ -82,7 +82,7 @@
8282
"test.framework_version" : ${content_meta_test_framework_version},
8383
"test.module" : "munit-junit-4",
8484
"test.source.file" : "dummy_source_path",
85-
"test.status" : "fail",
85+
"test.status" : "pass",
8686
"test.suite" : "org.example.TestFailedMUnit",
8787
"test.type" : "test",
8888
"test_session.name" : "session-name"

‎dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"test.command" : "munit-junit-4",
1717
"test.framework" : "munit",
1818
"test.framework_version" : ${content_meta_test_framework_version},
19-
"test.status" : "fail",
19+
"test.status" : "pass",
2020
"test.test_management.enabled" : "true",
2121
"test.type" : "test",
2222
"test_session.name" : "session-name"
@@ -49,7 +49,7 @@
4949
"test.framework" : "munit",
5050
"test.framework_version" : ${content_meta_test_framework_version},
5151
"test.module" : "munit-junit-4",
52-
"test.status" : "fail",
52+
"test.status" : "pass",
5353
"test.test_management.enabled" : "true",
5454
"test.type" : "test",
5555
"test_session.name" : "session-name"
@@ -82,7 +82,7 @@
8282
"test.framework_version" : ${content_meta_test_framework_version},
8383
"test.module" : "munit-junit-4",
8484
"test.source.file" : "dummy_source_path",
85-
"test.status" : "fail",
85+
"test.status" : "pass",
8686
"test.suite" : "org.example.TestFailedMUnit",
8787
"test.type" : "test",
8888
"test_session.name" : "session-name"

‎dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"test.command" : "munit-junit-4",
1717
"test.framework" : "munit",
1818
"test.framework_version" : ${content_meta_test_framework_version},
19-
"test.status" : "fail",
19+
"test.status" : "pass",
2020
"test.type" : "test",
2121
"test_session.name" : "session-name"
2222
},
@@ -48,7 +48,7 @@
4848
"test.framework" : "munit",
4949
"test.framework_version" : ${content_meta_test_framework_version},
5050
"test.module" : "munit-junit-4",
51-
"test.status" : "fail",
51+
"test.status" : "pass",
5252
"test.type" : "test",
5353
"test_session.name" : "session-name"
5454
},
@@ -80,7 +80,7 @@
8080
"test.framework_version" : ${content_meta_test_framework_version},
8181
"test.module" : "munit-junit-4",
8282
"test.source.file" : "dummy_source_path",
83-
"test.status" : "fail",
83+
"test.status" : "pass",
8484
"test.suite" : "org.example.TestFailedThenSucceedMUnit",
8585
"test.type" : "test",
8686
"test_session.name" : "session-name"

0 commit comments

Comments
 (0)