Skip to content

Commit 44fdacd

Browse files
Support distributed traces in tests
1 parent 7afe313 commit 44fdacd

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptor.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package datadog.trace.civisibility.interceptor;
22

3-
import datadog.trace.api.DDSpanTypes;
43
import datadog.trace.api.DDTags;
54
import datadog.trace.api.interceptor.AbstractTraceInterceptor;
65
import datadog.trace.api.interceptor.MutableSpan;
76
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
87
import datadog.trace.core.DDSpan;
98
import datadog.trace.core.DDTraceCoreInfo;
109
import java.util.Collection;
11-
import java.util.Collections;
1210

1311
public class CiVisibilityTraceInterceptor extends AbstractTraceInterceptor {
1412

@@ -29,20 +27,6 @@ public Collection<? extends MutableSpan> onTraceComplete(
2927
}
3028

3129
final DDSpan firstSpan = (DDSpan) trace.iterator().next();
32-
final DDSpan localRootSpan = firstSpan.getLocalRootSpan();
33-
34-
final DDSpan spanToCheck = null == localRootSpan ? firstSpan : localRootSpan;
35-
36-
// If root span is not a CI visibility span, we drop the full trace.
37-
CharSequence type = spanToCheck.getType(); // Don't null pointer if there is no type
38-
if (type == null
39-
|| (!DDSpanTypes.TEST.contentEquals(type)
40-
&& !DDSpanTypes.TEST_SUITE_END.contentEquals(type)
41-
&& !DDSpanTypes.TEST_MODULE_END.contentEquals(type)
42-
&& !DDSpanTypes.TEST_SESSION_END.contentEquals(type))) {
43-
return Collections.emptyList();
44-
}
45-
4630
// If the trace belongs to a "test", we need to set the origin to `ciapp-test` and the
4731
// `library_version` tag for all spans.
4832
firstSpan.context().setOrigin(CIAPP_TEST_ORIGIN);

dd-trace-core/src/test/groovy/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.groovy

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ class CiVisibilityTraceInterceptorTest extends DDCoreSpecification {
1616
tracer?.close()
1717
}
1818

19-
def "discard a trace that does not come from a test"() {
20-
tracer.addTraceInterceptor(CiVisibilityTraceInterceptor.INSTANCE)
21-
tracer.buildSpan("sample-span").start().finish()
22-
23-
expect:
24-
writer.size() == 0
25-
}
26-
2719
def "add ciapp origin and tracer version to spans of type #spanType"() {
2820
setup:
2921
tracer.addTraceInterceptor(CiVisibilityTraceInterceptor.INSTANCE)

0 commit comments

Comments
 (0)