Skip to content

Commit e3b7ad9

Browse files
update is quarantined tag according to RFC
1 parent 3e097b6 commit e3b7ad9

File tree

41 files changed

+98
-97
lines changed

Some content is hidden

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

41 files changed

+98
-97
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public void end(@Nullable Long endTime) {
277277
EventType.TEST,
278278
span.getTag(Tags.TEST_IS_NEW) != null ? IsNew.TRUE : null,
279279
span.getTag(Tags.TEST_IS_MODIFIED) != null ? IsModified.TRUE : null,
280-
span.getTag(Tags.TEST_MANAGEMENT_IS_QUARANTINED) != null ? IsQuarantined.TRUE : null,
280+
span.getTag(Tags.TEST_TEST_MANAGEMENT_IS_QUARANTINED) != null ? IsQuarantined.TRUE : null,
281281
span.getTag(Tags.TEST_IS_RETRY) != null ? IsRetry.TRUE : null,
282282
span.getTag(Tags.TEST_HAS_FAILED_ALL_RETRIES) != null ? HasFailedAllRetries.TRUE : null,
283283
retryReason instanceof TagValue ? (TagValue) retryReason : null,

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void onTestStart(
168168
}
169169

170170
if (testModule.isQuarantined(thisTest)) {
171-
test.setTag(Tags.TEST_MANAGEMENT_IS_QUARANTINED, true);
171+
test.setTag(Tags.TEST_TEST_MANAGEMENT_IS_QUARANTINED, true);
172172
}
173173

174174
if (testExecutionHistory != null) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
"span.kind" : "test",
5050
"test.framework" : "cucumber",
5151
"test.framework_version" : ${content_meta_test_framework_version},
52-
"test.management.is_quarantined" : "true",
5352
"test.module" : "cucumber-junit-4",
5453
"test.name" : "Addition",
5554
"test.status" : "fail",
5655
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
56+
"test.test_management.is_quarantined" : "true",
5757
"test.traits" : "{\"category\":[\"foo\"]}",
5858
"test.type" : "test",
5959
"test_session.name" : "session-name"
@@ -97,12 +97,12 @@
9797
"test.framework" : "cucumber",
9898
"test.framework_version" : ${content_meta_test_framework_version},
9999
"test.is_retry" : "true",
100-
"test.management.is_quarantined" : "true",
101100
"test.module" : "cucumber-junit-4",
102101
"test.name" : "Addition",
103102
"test.retry_reason" : "atr",
104103
"test.status" : "fail",
105104
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
105+
"test.test_management.is_quarantined" : "true",
106106
"test.traits" : "{\"category\":[\"foo\"]}",
107107
"test.type" : "test",
108108
"test_session.name" : "session-name"
@@ -146,12 +146,12 @@
146146
"test.framework" : "cucumber",
147147
"test.framework_version" : ${content_meta_test_framework_version},
148148
"test.is_retry" : "true",
149-
"test.management.is_quarantined" : "true",
150149
"test.module" : "cucumber-junit-4",
151150
"test.name" : "Addition",
152151
"test.retry_reason" : "atr",
153152
"test.status" : "fail",
154153
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
154+
"test.test_management.is_quarantined" : "true",
155155
"test.traits" : "{\"category\":[\"foo\"]}",
156156
"test.type" : "test",
157157
"test_session.name" : "session-name"
@@ -195,12 +195,12 @@
195195
"test.framework" : "cucumber",
196196
"test.framework_version" : ${content_meta_test_framework_version},
197197
"test.is_retry" : "true",
198-
"test.management.is_quarantined" : "true",
199198
"test.module" : "cucumber-junit-4",
200199
"test.name" : "Addition",
201200
"test.retry_reason" : "atr",
202201
"test.status" : "fail",
203202
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
203+
"test.test_management.is_quarantined" : "true",
204204
"test.traits" : "{\"category\":[\"foo\"]}",
205205
"test.type" : "test",
206206
"test_session.name" : "session-name"
@@ -245,12 +245,12 @@
245245
"test.framework_version" : ${content_meta_test_framework_version},
246246
"test.has_failed_all_retries" : "true",
247247
"test.is_retry" : "true",
248-
"test.management.is_quarantined" : "true",
249248
"test.module" : "cucumber-junit-4",
250249
"test.name" : "Addition",
251250
"test.retry_reason" : "atr",
252251
"test.status" : "fail",
253252
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
253+
"test.test_management.is_quarantined" : "true",
254254
"test.traits" : "{\"category\":[\"foo\"]}",
255255
"test.type" : "test",
256256
"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
@@ -50,11 +50,11 @@
5050
"test.framework" : "cucumber",
5151
"test.framework_version" : ${content_meta_test_framework_version},
5252
"test.is_new" : "true",
53-
"test.management.is_quarantined" : "true",
5453
"test.module" : "cucumber-junit-4",
5554
"test.name" : "Addition",
5655
"test.status" : "fail",
5756
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
57+
"test.test_management.is_quarantined" : "true",
5858
"test.traits" : "{\"category\":[\"foo\"]}",
5959
"test.type" : "test",
6060
"test_session.name" : "session-name"
@@ -99,12 +99,12 @@
9999
"test.framework_version" : ${content_meta_test_framework_version},
100100
"test.is_new" : "true",
101101
"test.is_retry" : "true",
102-
"test.management.is_quarantined" : "true",
103102
"test.module" : "cucumber-junit-4",
104103
"test.name" : "Addition",
105104
"test.retry_reason" : "efd",
106105
"test.status" : "fail",
107106
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
107+
"test.test_management.is_quarantined" : "true",
108108
"test.traits" : "{\"category\":[\"foo\"]}",
109109
"test.type" : "test",
110110
"test_session.name" : "session-name"
@@ -150,12 +150,12 @@
150150
"test.has_failed_all_retries" : "true",
151151
"test.is_new" : "true",
152152
"test.is_retry" : "true",
153-
"test.management.is_quarantined" : "true",
154153
"test.module" : "cucumber-junit-4",
155154
"test.name" : "Addition",
156155
"test.retry_reason" : "efd",
157156
"test.status" : "fail",
158157
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
158+
"test.test_management.is_quarantined" : "true",
159159
"test.traits" : "{\"category\":[\"foo\"]}",
160160
"test.type" : "test",
161161
"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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
"span.kind" : "test",
5050
"test.framework" : "cucumber",
5151
"test.framework_version" : ${content_meta_test_framework_version},
52-
"test.management.is_quarantined" : "true",
5352
"test.module" : "cucumber-junit-4",
5453
"test.name" : "Addition",
5554
"test.status" : "fail",
5655
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
56+
"test.test_management.is_quarantined" : "true",
5757
"test.traits" : "{\"category\":[\"foo\"]}",
5858
"test.type" : "test",
5959
"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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
"span.kind" : "test",
5050
"test.framework" : "cucumber",
5151
"test.framework_version" : ${content_meta_test_framework_version},
52-
"test.management.is_quarantined" : "true",
5352
"test.module" : "cucumber-junit-4",
5453
"test.name" : "Addition",
5554
"test.status" : "fail",
5655
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
56+
"test.test_management.is_quarantined" : "true",
5757
"test.traits" : "{\"category\":[\"foo\"]}",
5858
"test.type" : "test",
5959
"test_session.name" : "session-name"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@
122122
"test.codeowners" : "[\"owner1\",\"owner2\"]",
123123
"test.framework" : "munit",
124124
"test.framework_version" : ${content_meta_test_framework_version},
125-
"test.management.is_quarantined" : "true",
126125
"test.module" : "munit-junit-4",
127126
"test.name" : "Calculator.add",
128127
"test.source.file" : "dummy_source_path",
129128
"test.status" : "fail",
130129
"test.suite" : "org.example.TestFailedMUnit",
130+
"test.test_management.is_quarantined" : "true",
131131
"test.traits" : "{\"category\":[\"myTag\"]}",
132132
"test.type" : "test",
133133
"test_session.name" : "session-name"
@@ -172,13 +172,13 @@
172172
"test.framework" : "munit",
173173
"test.framework_version" : ${content_meta_test_framework_version},
174174
"test.is_retry" : "true",
175-
"test.management.is_quarantined" : "true",
176175
"test.module" : "munit-junit-4",
177176
"test.name" : "Calculator.add",
178177
"test.retry_reason" : "atr",
179178
"test.source.file" : "dummy_source_path",
180179
"test.status" : "fail",
181180
"test.suite" : "org.example.TestFailedMUnit",
181+
"test.test_management.is_quarantined" : "true",
182182
"test.traits" : "{\"category\":[\"myTag\"]}",
183183
"test.type" : "test",
184184
"test_session.name" : "session-name"
@@ -223,13 +223,13 @@
223223
"test.framework" : "munit",
224224
"test.framework_version" : ${content_meta_test_framework_version},
225225
"test.is_retry" : "true",
226-
"test.management.is_quarantined" : "true",
227226
"test.module" : "munit-junit-4",
228227
"test.name" : "Calculator.add",
229228
"test.retry_reason" : "atr",
230229
"test.source.file" : "dummy_source_path",
231230
"test.status" : "fail",
232231
"test.suite" : "org.example.TestFailedMUnit",
232+
"test.test_management.is_quarantined" : "true",
233233
"test.traits" : "{\"category\":[\"myTag\"]}",
234234
"test.type" : "test",
235235
"test_session.name" : "session-name"
@@ -274,13 +274,13 @@
274274
"test.framework" : "munit",
275275
"test.framework_version" : ${content_meta_test_framework_version},
276276
"test.is_retry" : "true",
277-
"test.management.is_quarantined" : "true",
278277
"test.module" : "munit-junit-4",
279278
"test.name" : "Calculator.add",
280279
"test.retry_reason" : "atr",
281280
"test.source.file" : "dummy_source_path",
282281
"test.status" : "fail",
283282
"test.suite" : "org.example.TestFailedMUnit",
283+
"test.test_management.is_quarantined" : "true",
284284
"test.traits" : "{\"category\":[\"myTag\"]}",
285285
"test.type" : "test",
286286
"test_session.name" : "session-name"
@@ -326,13 +326,13 @@
326326
"test.framework_version" : ${content_meta_test_framework_version},
327327
"test.has_failed_all_retries" : "true",
328328
"test.is_retry" : "true",
329-
"test.management.is_quarantined" : "true",
330329
"test.module" : "munit-junit-4",
331330
"test.name" : "Calculator.add",
332331
"test.retry_reason" : "atr",
333332
"test.source.file" : "dummy_source_path",
334333
"test.status" : "fail",
335334
"test.suite" : "org.example.TestFailedMUnit",
335+
"test.test_management.is_quarantined" : "true",
336336
"test.traits" : "{\"category\":[\"myTag\"]}",
337337
"test.type" : "test",
338338
"test_session.name" : "session-name"

dd-java-agent/instrumentation/junit-4.10/munit-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
@@ -125,12 +125,12 @@
125125
"test.framework" : "munit",
126126
"test.framework_version" : ${content_meta_test_framework_version},
127127
"test.is_new" : "true",
128-
"test.management.is_quarantined" : "true",
129128
"test.module" : "munit-junit-4",
130129
"test.name" : "Calculator.add",
131130
"test.source.file" : "dummy_source_path",
132131
"test.status" : "fail",
133132
"test.suite" : "org.example.TestFailedMUnit",
133+
"test.test_management.is_quarantined" : "true",
134134
"test.traits" : "{\"category\":[\"myTag\"]}",
135135
"test.type" : "test",
136136
"test_session.name" : "session-name"
@@ -176,13 +176,13 @@
176176
"test.framework_version" : ${content_meta_test_framework_version},
177177
"test.is_new" : "true",
178178
"test.is_retry" : "true",
179-
"test.management.is_quarantined" : "true",
180179
"test.module" : "munit-junit-4",
181180
"test.name" : "Calculator.add",
182181
"test.retry_reason" : "efd",
183182
"test.source.file" : "dummy_source_path",
184183
"test.status" : "fail",
185184
"test.suite" : "org.example.TestFailedMUnit",
185+
"test.test_management.is_quarantined" : "true",
186186
"test.traits" : "{\"category\":[\"myTag\"]}",
187187
"test.type" : "test",
188188
"test_session.name" : "session-name"
@@ -229,13 +229,13 @@
229229
"test.has_failed_all_retries" : "true",
230230
"test.is_new" : "true",
231231
"test.is_retry" : "true",
232-
"test.management.is_quarantined" : "true",
233232
"test.module" : "munit-junit-4",
234233
"test.name" : "Calculator.add",
235234
"test.retry_reason" : "efd",
236235
"test.source.file" : "dummy_source_path",
237236
"test.status" : "fail",
238237
"test.suite" : "org.example.TestFailedMUnit",
238+
"test.test_management.is_quarantined" : "true",
239239
"test.traits" : "{\"category\":[\"myTag\"]}",
240240
"test.type" : "test",
241241
"test_session.name" : "session-name"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,12 @@
124124
"test.codeowners" : "[\"owner1\",\"owner2\"]",
125125
"test.framework" : "munit",
126126
"test.framework_version" : ${content_meta_test_framework_version},
127-
"test.management.is_quarantined" : "true",
128127
"test.module" : "munit-junit-4",
129128
"test.name" : "Calculator.add",
130129
"test.source.file" : "dummy_source_path",
131130
"test.status" : "fail",
132131
"test.suite" : "org.example.TestFailedMUnit",
132+
"test.test_management.is_quarantined" : "true",
133133
"test.traits" : "{\"category\":[\"myTag\"]}",
134134
"test.type" : "test",
135135
"test_session.name" : "session-name"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@
122122
"test.codeowners" : "[\"owner1\",\"owner2\"]",
123123
"test.framework" : "munit",
124124
"test.framework_version" : ${content_meta_test_framework_version},
125-
"test.management.is_quarantined" : "true",
126125
"test.module" : "munit-junit-4",
127126
"test.name" : "Calculator.add",
128127
"test.source.file" : "dummy_source_path",
129128
"test.status" : "fail",
130129
"test.suite" : "org.example.TestFailedMUnit",
130+
"test.test_management.is_quarantined" : "true",
131131
"test.traits" : "{\"category\":[\"myTag\"]}",
132132
"test.type" : "test",
133133
"test_session.name" : "session-name"

0 commit comments

Comments
 (0)