Skip to content

Commit 9b93366

Browse files
daniel-mohedanodevflow.devflow-routing-intake
andauthored
fix: instrumentation test spans (#10726)
fix: instrumentation test spans Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>
1 parent 39d55ab commit 9b93366

9 files changed

Lines changed: 18 additions & 9 deletions

File tree

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ abstract class CiVisibilityTestUtils {
6565

6666
// ignored tags on assertion and fixture build
6767
static final List<String> IGNORED_TAGS = LibraryCapability.values().toList().stream().map(c -> "content.meta.['${c.asTag()}']").collect(Collectors.toList()) +
68-
["content.meta.['_dd.integration']"]
68+
["content.meta.['_dd.integration']", "content.meta.['_dd.svc_src']"]
6969

7070
static final List<DynamicPath> COVERAGE_DYNAMIC_PATHS = [path("test_session_id"), path("test_suite_id"), path("span_id"),]
7171

dd-java-agent/instrumentation/weaver-0.9/src/latestDepTest/resources/test-failed-exception-pure/events.ftl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"runtime-id" : ${content_meta_runtime_id},
5353
"span.kind" : "test",
5454
"test.codeowners" : "[\"owner1\",\"owner2\"]",
55+
"test.final_status" : "fail",
5556
"test.framework" : "weaver",
5657
"test.framework_version" : ${content_meta_test_framework_version},
5758
"test.module" : "weaver-0.9",
@@ -147,4 +148,4 @@
147148
},
148149
"type" : "test_module_end",
149150
"version" : 1
150-
} ]
151+
} ]

dd-java-agent/instrumentation/weaver-0.9/src/latestDepTest/resources/test-failed-pure/events.ftl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"runtime-id" : ${content_meta_runtime_id},
5353
"span.kind" : "test",
5454
"test.codeowners" : "[\"owner1\",\"owner2\"]",
55+
"test.final_status" : "fail",
5556
"test.framework" : "weaver",
5657
"test.framework_version" : ${content_meta_test_framework_version},
5758
"test.module" : "weaver-0.9",
@@ -147,4 +148,4 @@
147148
},
148149
"type" : "test_module_end",
149150
"version" : 1
150-
} ]
151+
} ]

dd-java-agent/instrumentation/weaver-0.9/src/latestDepTest/resources/test-failed/events.ftl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"runtime-id" : ${content_meta_runtime_id},
5353
"span.kind" : "test",
5454
"test.codeowners" : "[\"owner1\",\"owner2\"]",
55+
"test.final_status" : "fail",
5556
"test.framework" : "weaver",
5657
"test.framework_version" : ${content_meta_test_framework_version},
5758
"test.module" : "weaver-0.9",
@@ -147,4 +148,4 @@
147148
},
148149
"type" : "test_module_end",
149150
"version" : 1
150-
} ]
151+
} ]

dd-java-agent/instrumentation/weaver-0.9/src/latestDepTest/resources/test-ignored/events.ftl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"runtime-id" : ${content_meta_runtime_id},
5050
"span.kind" : "test",
5151
"test.codeowners" : "[\"owner1\",\"owner2\"]",
52+
"test.final_status" : "skip",
5253
"test.framework" : "weaver",
5354
"test.framework_version" : ${content_meta_test_framework_version},
5455
"test.module" : "weaver-0.9",
@@ -145,4 +146,4 @@
145146
},
146147
"type" : "test_module_end",
147148
"version" : 1
148-
} ]
149+
} ]

dd-java-agent/instrumentation/weaver-0.9/src/latestDepTest/resources/test-succeed-global-resource/events.ftl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"runtime-id" : ${content_meta_runtime_id},
5050
"span.kind" : "test",
5151
"test.codeowners" : "[\"owner1\",\"owner2\"]",
52+
"test.final_status" : "pass",
5253
"test.framework" : "weaver",
5354
"test.framework_version" : ${content_meta_test_framework_version},
5455
"test.module" : "weaver-0.9",
@@ -144,4 +145,4 @@
144145
},
145146
"type" : "test_module_end",
146147
"version" : 1
147-
} ]
148+
} ]

dd-java-agent/instrumentation/weaver-0.9/src/latestDepTest/resources/test-succeed-pure/events.ftl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"runtime-id" : ${content_meta_runtime_id},
5050
"span.kind" : "test",
5151
"test.codeowners" : "[\"owner1\",\"owner2\"]",
52+
"test.final_status" : "pass",
5253
"test.framework" : "weaver",
5354
"test.framework_version" : ${content_meta_test_framework_version},
5455
"test.module" : "weaver-0.9",
@@ -144,4 +145,4 @@
144145
},
145146
"type" : "test_module_end",
146147
"version" : 1
147-
} ]
148+
} ]

dd-java-agent/instrumentation/weaver-0.9/src/latestDepTest/resources/test-succeed-suite-resource/events.ftl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"runtime-id" : ${content_meta_runtime_id},
5050
"span.kind" : "test",
5151
"test.codeowners" : "[\"owner1\",\"owner2\"]",
52+
"test.final_status" : "pass",
5253
"test.framework" : "weaver",
5354
"test.framework_version" : ${content_meta_test_framework_version},
5455
"test.module" : "weaver-0.9",
@@ -93,6 +94,7 @@
9394
"runtime-id" : ${content_meta_runtime_id},
9495
"span.kind" : "test",
9596
"test.codeowners" : "[\"owner1\",\"owner2\"]",
97+
"test.final_status" : "pass",
9698
"test.framework" : "weaver",
9799
"test.framework_version" : ${content_meta_test_framework_version},
98100
"test.module" : "weaver-0.9",
@@ -188,4 +190,4 @@
188190
},
189191
"type" : "test_module_end",
190192
"version" : 1
191-
} ]
193+
} ]

dd-java-agent/instrumentation/weaver-0.9/src/latestDepTest/resources/test-succeeded/events.ftl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"runtime-id" : ${content_meta_runtime_id},
5050
"span.kind" : "test",
5151
"test.codeowners" : "[\"owner1\",\"owner2\"]",
52+
"test.final_status" : "pass",
5253
"test.framework" : "weaver",
5354
"test.framework_version" : ${content_meta_test_framework_version},
5455
"test.module" : "weaver-0.9",
@@ -144,4 +145,4 @@
144145
},
145146
"type" : "test_module_end",
146147
"version" : 1
147-
} ]
148+
} ]

0 commit comments

Comments
 (0)