Skip to content

Commit 052c7f2

Browse files
PerfectSlayerPerfectSlayer
committed
feat(testing): Refine default tags
1 parent 54b08ae commit 052c7f2

1 file changed

Lines changed: 22 additions & 10 deletions

File tree

  • dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions

‎dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TagsMatcher.java‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,28 @@
33
import static datadog.trace.agent.test.assertions.Matchers.any;
44
import static datadog.trace.agent.test.assertions.Matchers.is;
55
import static datadog.trace.agent.test.assertions.Matchers.isNonNull;
6+
import static datadog.trace.api.DDTags.BASE_SERVICE;
7+
import static datadog.trace.api.DDTags.DD_INTEGRATION;
8+
import static datadog.trace.api.DDTags.DJM_ENABLED;
9+
import static datadog.trace.api.DDTags.DSM_ENABLED;
610
import static datadog.trace.api.DDTags.ERROR_MSG;
711
import static datadog.trace.api.DDTags.ERROR_STACK;
812
import static datadog.trace.api.DDTags.ERROR_TYPE;
913
import static datadog.trace.api.DDTags.LANGUAGE_TAG_KEY;
14+
import static datadog.trace.api.DDTags.PARENT_ID;
15+
import static datadog.trace.api.DDTags.PID_TAG;
16+
import static datadog.trace.api.DDTags.PROFILING_CONTEXT_ENGINE;
17+
import static datadog.trace.api.DDTags.PROFILING_ENABLED;
1018
import static datadog.trace.api.DDTags.REQUIRED_CODE_ORIGIN_TAGS;
1119
import static datadog.trace.api.DDTags.RUNTIME_ID_TAG;
20+
import static datadog.trace.api.DDTags.SCHEMA_VERSION_TAG_KEY;
21+
import static datadog.trace.api.DDTags.SPAN_LINKS;
1222
import static datadog.trace.api.DDTags.THREAD_ID;
1323
import static datadog.trace.api.DDTags.THREAD_NAME;
24+
import static datadog.trace.api.DDTags.TRACER_HOST;
1425
import static datadog.trace.common.sampling.RateByServiceTraceSampler.SAMPLING_AGENT_RATE;
1526
import static datadog.trace.common.writer.ddagent.TraceMapper.SAMPLING_PRIORITY_KEY;
1627

17-
import datadog.trace.api.DDTags;
1828
import java.util.HashMap;
1929
import java.util.Map;
2030

@@ -34,15 +44,17 @@ public static TagsMatcher defaultTags() {
3444
tagMatchers.put(SAMPLING_AGENT_RATE, any());
3545
tagMatchers.put(SAMPLING_PRIORITY_KEY.toString(), any());
3646
tagMatchers.put("_sample_rate", any());
37-
tagMatchers.put(DDTags.PID_TAG, any());
38-
tagMatchers.put(DDTags.SCHEMA_VERSION_TAG_KEY, any());
39-
tagMatchers.put(DDTags.PROFILING_ENABLED, any());
40-
tagMatchers.put(DDTags.PROFILING_CONTEXT_ENGINE, any());
41-
tagMatchers.put(DDTags.BASE_SERVICE, any());
42-
tagMatchers.put(DDTags.DSM_ENABLED, any());
43-
tagMatchers.put(DDTags.DJM_ENABLED, any());
44-
tagMatchers.put(DDTags.PARENT_ID, any());
45-
tagMatchers.put(DDTags.SPAN_LINKS, any()); // this is checked by LinksAsserter
47+
tagMatchers.put(PID_TAG, any());
48+
tagMatchers.put(SCHEMA_VERSION_TAG_KEY, any());
49+
tagMatchers.put(PROFILING_ENABLED, any());
50+
tagMatchers.put(PROFILING_CONTEXT_ENGINE, any());
51+
tagMatchers.put(BASE_SERVICE, any());
52+
tagMatchers.put(DSM_ENABLED, any());
53+
tagMatchers.put(DJM_ENABLED, any());
54+
tagMatchers.put(PARENT_ID, any());
55+
tagMatchers.put(SPAN_LINKS, any()); // this is checked by LinksAsserter
56+
tagMatchers.put(DD_INTEGRATION, any());
57+
tagMatchers.put(TRACER_HOST, any());
4658

4759
for (String tagName : REQUIRED_CODE_ORIGIN_TAGS) {
4860
tagMatchers.put(tagName, any());

0 commit comments

Comments
 (0)