Skip to content

Commit 523df01

Browse files
nikita-tkachenko-datadognikita-tkachenko-datadog
authored
Update CI Visibility test fixtures (#8266)
1 parent 3900e56 commit 523df01

File tree

358 files changed

+54194
-50706
lines changed

Some content is hidden

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

358 files changed

+54194
-50706
lines changed

‎dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ abstract class CiVisibilityTestUtils {
109109

110110
static final ObjectMapper JSON_MAPPER = new ObjectMapper() { {
111111
enable(SerializationFeature.INDENT_OUTPUT)
112+
enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS)
112113
}
113114
}
114115

‎dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/coverages.ftl

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[ {
2-
"test_session_id" : ${content_test_session_id},
3-
"test_suite_id" : ${content_test_suite_id},
4-
"span_id" : ${content_span_id},
52
"files" : [ {
63
"filename" : "org/example/cucumber/calculator/basic_arithmetic.feature"
7-
} ]
4+
} ],
5+
"span_id" : ${content_span_id},
6+
"test_session_id" : ${content_test_session_id},
7+
"test_suite_id" : ${content_test_suite_id}
88
} ]

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

+104-95
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,144 @@
11
[ {
2-
"type" : "test_suite_end",
3-
"version" : 1,
42
"content" : {
5-
"test_session_id" : ${content_test_session_id},
6-
"test_module_id" : ${content_test_module_id},
7-
"test_suite_id" : ${content_test_suite_id},
8-
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
9-
"name" : "junit.test_suite",
10-
"resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
11-
"start" : ${content_start},
123
"duration" : ${content_duration},
134
"error" : 0,
14-
"metrics" : { },
155
"meta" : {
16-
"test.type" : "test",
17-
"test.module" : "cucumber-junit-4",
18-
"test.status" : "pass",
19-
"test_session.name" : "session-name",
20-
"env" : "none",
6+
"_dd.p.tid" : ${content_meta__dd_p_tid},
7+
"component" : "junit",
218
"dummy_ci_tag" : "dummy_ci_tag_value",
9+
"env" : "none",
2210
"library_version" : ${content_meta_library_version},
23-
"component" : "junit",
2411
"span.kind" : "test_suite_end",
25-
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
12+
"test.framework" : "cucumber",
2613
"test.framework_version" : ${content_meta_test_framework_version},
27-
"test.framework" : "cucumber"
28-
}
29-
}
14+
"test.module" : "cucumber-junit-4",
15+
"test.status" : "pass",
16+
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
17+
"test.type" : "test",
18+
"test_session.name" : "session-name"
19+
},
20+
"metrics" : {
21+
"_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}
22+
},
23+
"name" : "junit.test_suite",
24+
"resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
25+
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
26+
"start" : ${content_start},
27+
"test_module_id" : ${content_test_module_id},
28+
"test_session_id" : ${content_test_session_id},
29+
"test_suite_id" : ${content_test_suite_id}
30+
},
31+
"type" : "test_suite_end",
32+
"version" : 1
3033
}, {
31-
"type" : "test",
32-
"version" : 2,
3334
"content" : {
34-
"trace_id" : ${content_trace_id},
35-
"span_id" : ${content_span_id},
36-
"parent_id" : ${content_parent_id},
37-
"test_session_id" : ${content_test_session_id},
38-
"test_module_id" : ${content_test_module_id},
39-
"test_suite_id" : ${content_test_suite_id},
40-
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
41-
"name" : "junit.test",
42-
"resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition",
43-
"start" : ${content_start_2},
4435
"duration" : ${content_duration_2},
4536
"error" : 0,
46-
"metrics" : {
47-
"process_id" : ${content_metrics_process_id},
48-
"_dd.profiling.enabled" : 0,
49-
"_dd.trace_span_attribute_schema" : 0
50-
},
5137
"meta" : {
52-
"test.type" : "test",
38+
"_dd.profiling.ctx" : "test",
5339
"_dd.tracer_host" : ${content_meta__dd_tracer_host},
54-
"test.module" : "cucumber-junit-4",
55-
"test.status" : "pass",
56-
"test.traits" : "{\"category\":[\"foo\"]}",
57-
"test_session.name" : "session-name",
58-
"language" : "jvm",
59-
"env" : "none",
40+
"component" : "junit",
6041
"dummy_ci_tag" : "dummy_ci_tag_value",
42+
"env" : "none",
43+
"language" : "jvm",
6144
"library_version" : ${content_meta_library_version},
62-
"component" : "junit",
63-
"_dd.profiling.ctx" : "test",
64-
"test.name" : "Addition",
65-
"span.kind" : "test",
66-
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
6745
"runtime-id" : ${content_meta_runtime_id},
46+
"span.kind" : "test",
47+
"test.framework" : "cucumber",
6848
"test.framework_version" : ${content_meta_test_framework_version},
69-
"test.framework" : "cucumber"
70-
}
71-
}
49+
"test.module" : "cucumber-junit-4",
50+
"test.name" : "Addition",
51+
"test.status" : "pass",
52+
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic",
53+
"test.traits" : "{\"category\":[\"foo\"]}",
54+
"test.type" : "test",
55+
"test_session.name" : "session-name"
56+
},
57+
"metrics" : {
58+
"_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2},
59+
"_dd.profiling.enabled" : 0,
60+
"_dd.trace_span_attribute_schema" : 0,
61+
"process_id" : ${content_metrics_process_id}
62+
},
63+
"name" : "junit.test",
64+
"parent_id" : ${content_parent_id},
65+
"resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition",
66+
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
67+
"span_id" : ${content_span_id},
68+
"start" : ${content_start_2},
69+
"test_module_id" : ${content_test_module_id},
70+
"test_session_id" : ${content_test_session_id},
71+
"test_suite_id" : ${content_test_suite_id},
72+
"trace_id" : ${content_trace_id}
73+
},
74+
"type" : "test",
75+
"version" : 2
7276
}, {
73-
"type" : "test_session_end",
74-
"version" : 1,
7577
"content" : {
76-
"test_session_id" : ${content_test_session_id},
77-
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
78-
"name" : "junit.test_session",
79-
"resource" : "cucumber-junit-4",
80-
"start" : ${content_start_3},
8178
"duration" : ${content_duration_3},
8279
"error" : 0,
83-
"metrics" : {
84-
"process_id" : ${content_metrics_process_id},
85-
"_dd.profiling.enabled" : 0,
86-
"_dd.trace_span_attribute_schema" : 0
87-
},
8880
"meta" : {
89-
"test.type" : "test",
81+
"_dd.p.tid" : ${content_meta__dd_p_tid_2},
82+
"_dd.profiling.ctx" : "test",
9083
"_dd.tracer_host" : ${content_meta__dd_tracer_host},
91-
"test.status" : "pass",
92-
"test.early_flake.enabled" : "true",
93-
"test_session.name" : "session-name",
94-
"language" : "jvm",
95-
"env" : "none",
84+
"component" : "junit",
9685
"dummy_ci_tag" : "dummy_ci_tag_value",
86+
"env" : "none",
87+
"language" : "jvm",
9788
"library_version" : ${content_meta_library_version},
98-
"component" : "junit",
99-
"_dd.profiling.ctx" : "test",
100-
"span.kind" : "test_session_end",
10189
"runtime-id" : ${content_meta_runtime_id},
90+
"span.kind" : "test_session_end",
10291
"test.command" : "cucumber-junit-4",
92+
"test.early_flake.enabled" : "true",
93+
"test.framework" : "cucumber",
10394
"test.framework_version" : ${content_meta_test_framework_version},
104-
"test.framework" : "cucumber"
105-
}
106-
}
95+
"test.status" : "pass",
96+
"test.type" : "test",
97+
"test_session.name" : "session-name"
98+
},
99+
"metrics" : {
100+
"_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
101+
"_dd.profiling.enabled" : 0,
102+
"_dd.trace_span_attribute_schema" : 0,
103+
"process_id" : ${content_metrics_process_id}
104+
},
105+
"name" : "junit.test_session",
106+
"resource" : "cucumber-junit-4",
107+
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
108+
"start" : ${content_start_3},
109+
"test_session_id" : ${content_test_session_id}
110+
},
111+
"type" : "test_session_end",
112+
"version" : 1
107113
}, {
108-
"type" : "test_module_end",
109-
"version" : 1,
110114
"content" : {
111-
"test_session_id" : ${content_test_session_id},
112-
"test_module_id" : ${content_test_module_id},
113-
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
114-
"name" : "junit.test_module",
115-
"resource" : "cucumber-junit-4",
116-
"start" : ${content_start_4},
117115
"duration" : ${content_duration_4},
118116
"error" : 0,
119-
"metrics" : { },
120117
"meta" : {
121-
"test.type" : "test",
122-
"test.module" : "cucumber-junit-4",
123-
"test.status" : "pass",
124-
"test.early_flake.enabled" : "true",
125-
"test_session.name" : "session-name",
126-
"env" : "none",
118+
"_dd.p.tid" : ${content_meta__dd_p_tid_3},
119+
"component" : "junit",
127120
"dummy_ci_tag" : "dummy_ci_tag_value",
121+
"env" : "none",
128122
"library_version" : ${content_meta_library_version},
129-
"component" : "junit",
130123
"span.kind" : "test_module_end",
124+
"test.early_flake.enabled" : "true",
125+
"test.framework" : "cucumber",
131126
"test.framework_version" : ${content_meta_test_framework_version},
132-
"test.framework" : "cucumber"
133-
}
134-
}
127+
"test.module" : "cucumber-junit-4",
128+
"test.status" : "pass",
129+
"test.type" : "test",
130+
"test_session.name" : "session-name"
131+
},
132+
"metrics" : {
133+
"_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
134+
},
135+
"name" : "junit.test_module",
136+
"resource" : "cucumber-junit-4",
137+
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
138+
"start" : ${content_start_4},
139+
"test_module_id" : ${content_test_module_id},
140+
"test_session_id" : ${content_test_session_id}
141+
},
142+
"type" : "test_module_end",
143+
"version" : 1
135144
} ]

‎dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
11
[ {
2-
"test_session_id" : ${content_test_session_id},
3-
"test_suite_id" : ${content_test_suite_id},
4-
"span_id" : ${content_span_id},
52
"files" : [ {
63
"filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature"
7-
} ]
8-
}, {
4+
} ],
5+
"span_id" : ${content_span_id},
96
"test_session_id" : ${content_test_session_id},
10-
"test_suite_id" : ${content_test_suite_id},
11-
"span_id" : ${content_span_id_2},
7+
"test_suite_id" : ${content_test_suite_id}
8+
}, {
129
"files" : [ {
1310
"filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature"
14-
} ]
15-
}, {
11+
} ],
12+
"span_id" : ${content_span_id_2},
1613
"test_session_id" : ${content_test_session_id},
17-
"test_suite_id" : ${content_test_suite_id},
18-
"span_id" : ${content_span_id_3},
14+
"test_suite_id" : ${content_test_suite_id}
15+
}, {
1916
"files" : [ {
2017
"filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature"
21-
} ]
22-
}, {
18+
} ],
19+
"span_id" : ${content_span_id_3},
2320
"test_session_id" : ${content_test_session_id},
24-
"test_suite_id" : ${content_test_suite_id},
25-
"span_id" : ${content_span_id_4},
21+
"test_suite_id" : ${content_test_suite_id}
22+
}, {
2623
"files" : [ {
2724
"filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature"
28-
} ]
29-
}, {
25+
} ],
26+
"span_id" : ${content_span_id_4},
3027
"test_session_id" : ${content_test_session_id},
31-
"test_suite_id" : ${content_test_suite_id},
32-
"span_id" : ${content_span_id_5},
28+
"test_suite_id" : ${content_test_suite_id}
29+
}, {
3330
"files" : [ {
3431
"filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature"
35-
} ]
36-
}, {
32+
} ],
33+
"span_id" : ${content_span_id_5},
3734
"test_session_id" : ${content_test_session_id},
38-
"test_suite_id" : ${content_test_suite_id},
39-
"span_id" : ${content_span_id_6},
35+
"test_suite_id" : ${content_test_suite_id}
36+
}, {
4037
"files" : [ {
4138
"filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature"
42-
} ]
43-
}, {
39+
} ],
40+
"span_id" : ${content_span_id_6},
4441
"test_session_id" : ${content_test_session_id},
45-
"test_suite_id" : ${content_test_suite_id},
46-
"span_id" : ${content_span_id_7},
42+
"test_suite_id" : ${content_test_suite_id}
43+
}, {
4744
"files" : [ {
4845
"filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature"
49-
} ]
50-
}, {
46+
} ],
47+
"span_id" : ${content_span_id_7},
5148
"test_session_id" : ${content_test_session_id},
52-
"test_suite_id" : ${content_test_suite_id},
53-
"span_id" : ${content_span_id_8},
49+
"test_suite_id" : ${content_test_suite_id}
50+
}, {
5451
"files" : [ {
5552
"filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature"
56-
} ]
53+
} ],
54+
"span_id" : ${content_span_id_8},
55+
"test_session_id" : ${content_test_session_id},
56+
"test_suite_id" : ${content_test_suite_id}
5757
} ]

0 commit comments

Comments
 (0)