diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy index 99d0e873fb4..d256af25d92 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy @@ -341,13 +341,13 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { ] + replacements // uncomment to generate expected data templates - // def clazz = this.getClass() - // def resourceName = clazz.name.replace('.', '/') + ".class" - // def classfilePath = clazz.getResource(resourceName).toURI().schemeSpecificPart - // def modulePath = classfilePath.substring(0, classfilePath.indexOf("/build/classes")) - // def baseTemplatesPath = modulePath + "/src/test/resources/" + testcaseName - // CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements) - // return [:] + // def clazz = this.getClass() + // def resourceName = "/" + clazz.name.replace('.', '/') + ".class" + // def classfilePath = clazz.getResource(resourceName).toURI().schemeSpecificPart + // def modulePath = classfilePath.substring(0, classfilePath.indexOf("/build/classes")) + // def baseTemplatesPath = modulePath + "/src/test/resources/" + testcaseName + // CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements) + // return [:] return CiVisibilityTestUtils.assertData(testcaseName, events, coverages, additionalReplacements) } diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy index f65885b44ac..7d6352d308e 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy @@ -7,6 +7,12 @@ import com.jayway.jsonpath.JsonPath import com.jayway.jsonpath.Option import com.jayway.jsonpath.ReadContext import com.jayway.jsonpath.WriteContext +import datadog.trace.api.Config +import datadog.trace.civisibility.ci.CIProviderInfoFactory +import datadog.trace.civisibility.ci.GitLabInfo +import datadog.trace.civisibility.ci.GithubActionsInfo +import datadog.trace.civisibility.ci.env.CiEnvironment +import datadog.trace.civisibility.ci.env.CiEnvironmentImpl import freemarker.core.Environment import freemarker.core.InvalidReferenceException import freemarker.template.Template @@ -87,10 +93,15 @@ abstract class CiVisibilityTestUtils { replacementMap.put(labelGenerator.forKey(e.key), "\"$e.value\"") } + def environment = System.getenv() + def ciRun = environment.get("GITHUB_ACTION") != null || environment.get("GITLAB_CI") != null + def comparisonMode = ciRun ? JSONCompareMode.LENIENT : JSONCompareMode.NON_EXTENSIBLE + def expectedEvents = getFreemarkerTemplate(baseTemplatesPath + "/events.ftl", replacementMap, events) def actualEvents = JSON_MAPPER.writeValueAsString(events) + try { - JSONAssert.assertEquals(expectedEvents, actualEvents, JSONCompareMode.LENIENT) + JSONAssert.assertEquals(expectedEvents, actualEvents, comparisonMode) } catch (AssertionError e) { throw new org.opentest4j.AssertionFailedError("Events mismatch", expectedEvents, actualEvents, e) } @@ -98,7 +109,7 @@ abstract class CiVisibilityTestUtils { def expectedCoverages = getFreemarkerTemplate(baseTemplatesPath + "/coverages.ftl", replacementMap, coverages) def actualCoverages = JSON_MAPPER.writeValueAsString(coverages) try { - JSONAssert.assertEquals(expectedCoverages, actualCoverages, JSONCompareMode.LENIENT) + JSONAssert.assertEquals(expectedCoverages, actualCoverages, comparisonMode) } catch (AssertionError e) { throw new org.opentest4j.AssertionFailedError("Coverages mismatch", expectedCoverages, actualCoverages, e) } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy index b57a0a52b4c..0c370fa1e10 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy @@ -69,7 +69,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { where: testcaseName | success | features | retriedTests - "test-failed" | false | ["org/example/cucumber/calculator/basic_arithmetic_failed.feature"] | [] + "test-no-retry-failed" | false | ["org/example/cucumber/calculator/basic_arithmetic_failed.feature"] | [] "test-retry-failed" | false | ["org/example/cucumber/calculator/basic_arithmetic_failed.feature"] | [ new TestIdentifier("classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "Addition", null) ] @@ -148,13 +148,13 @@ class CucumberTest extends CiVisibilityInstrumentationTest { assertSpansData(testcaseName) where: - testcaseName | features | quarantined | known + testcaseName | features | quarantined | known "test-quarantined-failed-known" | ["org/example/cucumber/calculator/basic_arithmetic_failed.feature"] | [ new TestIdentifier("classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "Addition", null) ] | [ new TestIdentifier("classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "Addition", null) ] - "test-quarantined-failed-efd" | ["org/example/cucumber/calculator/basic_arithmetic_failed.feature"] | [ + "test-quarantined-failed-efd" | ["org/example/cucumber/calculator/basic_arithmetic_failed.feature"] | [ new TestIdentifier("classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "Addition", null) ] | [] } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java index ffb393fce36..93161ff5aff 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java @@ -23,7 +23,7 @@ public void a_calculator_I_just_turned_on() { @Given("a flaky calculator I just turned on") public void a_flaky_calculator_I_just_turned_on() { - calc = ++flakyCounter >= 3 ? new Calculator() : null; + calc = new Calculator(++flakyCounter < 3); } @When("I add {int} and {int}") @@ -94,6 +94,15 @@ public void setOperation(String operation) { static class Calculator { private static final List OPS = asList("-", "+", "*", "/"); private final Deque stack = new LinkedList<>(); + private final boolean broken; + + public Calculator() { + this(false); + } + + public Calculator(boolean broken) { + this.broken = broken; + } public void push(Object arg) { if (OPS.contains(arg)) { @@ -116,6 +125,9 @@ public void push(Object arg) { } public Number value() { + if (broken) { + throw new RuntimeException("This test is flaky"); + } return stack.getLast(); } } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl index d6f9898d3e3..003c56eb305 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl @@ -40,8 +40,9 @@ "component" : "junit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", + "error.message" : ${content_meta_error_message}, "error.stack" : ${content_meta_error_stack}, - "error.type" : "java.lang.NullPointerException", + "error.type" : "java.lang.RuntimeException", "language" : "jvm", "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, @@ -85,8 +86,9 @@ "component" : "junit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", + "error.message" : ${content_meta_error_message}, "error.stack" : ${content_meta_error_stack_2}, - "error.type" : "java.lang.NullPointerException", + "error.type" : "java.lang.RuntimeException", "language" : "jvm", "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/coverages.ftl new file mode 100644 index 00000000000..e48f884bdbe --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/coverages.ftl @@ -0,0 +1,8 @@ +[ { + "files" : [ { + "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature" + } ], + "span_id" : ${content_span_id}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id} +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/events.ftl new file mode 100644 index 00000000000..dd668874669 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/events.ftl @@ -0,0 +1,145 @@ +[ { + "content" : { + "duration" : ${content_duration}, + "error" : 0, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "component" : "junit", + "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", + "library_version" : ${content_meta_library_version}, + "span.kind" : "test_suite_end", + "test.framework" : "cucumber", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.module" : "cucumber-junit-5", + "test.status" : "fail", + "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", + "test.type" : "test", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} + }, + "name" : "junit.test_suite", + "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "start" : ${content_start}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id} + }, + "type" : "test_suite_end", + "version" : 1 +}, { + "content" : { + "duration" : ${content_duration_2}, + "error" : 1, + "meta" : { + "_dd.profiling.ctx" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "component" : "junit", + "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", + "error.message" : ${content_meta_error_message}, + "error.stack" : ${content_meta_error_stack}, + "error.type" : "java.lang.AssertionError", + "language" : "jvm", + "library_version" : ${content_meta_library_version}, + "runtime-id" : ${content_meta_runtime_id}, + "span.kind" : "test", + "test.framework" : "cucumber", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.module" : "cucumber-junit-5", + "test.name" : "Addition", + "test.status" : "fail", + "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", + "test.traits" : "{\"category\":[\"foo\"]}", + "test.type" : "test", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "process_id" : ${content_metrics_process_id} + }, + "name" : "junit.test", + "parent_id" : ${content_parent_id}, + "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "span_id" : ${content_span_id}, + "start" : ${content_start_2}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id}, + "trace_id" : ${content_trace_id} + }, + "type" : "test", + "version" : 2 +}, { + "content" : { + "duration" : ${content_duration_3}, + "error" : 0, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.profiling.ctx" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "component" : "junit", + "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", + "language" : "jvm", + "library_version" : ${content_meta_library_version}, + "runtime-id" : ${content_meta_runtime_id}, + "span.kind" : "test_session_end", + "test.command" : "cucumber-junit-5", + "test.framework" : "cucumber", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.status" : "fail", + "test.type" : "test", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "process_id" : ${content_metrics_process_id} + }, + "name" : "junit.test_session", + "resource" : "cucumber-junit-5", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "start" : ${content_start_3}, + "test_session_id" : ${content_test_session_id} + }, + "type" : "test_session_end", + "version" : 1 +}, { + "content" : { + "duration" : ${content_duration_4}, + "error" : 0, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "component" : "junit", + "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", + "library_version" : ${content_meta_library_version}, + "span.kind" : "test_module_end", + "test.framework" : "cucumber", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.module" : "cucumber-junit-5", + "test.status" : "fail", + "test.type" : "test", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} + }, + "name" : "junit.test_module", + "resource" : "cucumber-junit-5", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "start" : ${content_start_4}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id} + }, + "type" : "test_module_end", + "version" : 1 +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/coverages.ftl b/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/events.ftl b/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/events.ftl new file mode 100644 index 00000000000..ccaee07fb18 --- /dev/null +++ b/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/events.ftl @@ -0,0 +1,207 @@ +[ { + "content" : { + "duration" : ${content_duration}, + "error" : 0, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "component" : "junit", + "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", + "library_version" : ${content_meta_library_version}, + "span.kind" : "test_suite_end", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.framework" : "junit5", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.module" : "selenium", + "test.source.file" : "dummy_source_path", + "test.status" : "pass", + "test.suite" : "org.example.TestSucceedMultipleSelenium", + "test.type" : "test", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "name" : "junit.test_suite", + "resource" : "org.example.TestSucceedMultipleSelenium", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "start" : ${content_start}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id} + }, + "type" : "test_suite_end", + "version" : 1 +}, { + "content" : { + "duration" : ${content_duration_2}, + "error" : 0, + "meta" : { + "_dd.profiling.ctx" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "component" : "junit", + "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", + "language" : "jvm", + "library_version" : ${content_meta_library_version}, + "runtime-id" : ${content_meta_runtime_id}, + "span.kind" : "test", + "test.browser.driver" : "selenium", + "test.browser.driver_version" : ${content_meta_test_browser_driver_version}, + "test.browser.name" : "htmlunit", + "test.browser.version" : ${content_meta_test_browser_version}, + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.framework" : "junit5", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.is_rum_active" : "true", + "test.module" : "selenium", + "test.name" : "test_succeed", + "test.source.file" : "dummy_source_path", + "test.source.method" : "test_succeed()V", + "test.status" : "pass", + "test.suite" : "org.example.TestSucceedMultipleSelenium", + "test.type" : "browser", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "process_id" : ${content_metrics_process_id}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "name" : "junit.test", + "parent_id" : ${content_parent_id}, + "resource" : "org.example.TestSucceedMultipleSelenium.test_succeed", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "span_id" : ${content_span_id}, + "start" : ${content_start_2}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id}, + "trace_id" : ${content_trace_id} + }, + "type" : "test", + "version" : 2 +}, { + "content" : { + "duration" : ${content_duration_3}, + "error" : 0, + "meta" : { + "_dd.profiling.ctx" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "component" : "junit", + "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", + "language" : "jvm", + "library_version" : ${content_meta_library_version}, + "runtime-id" : ${content_meta_runtime_id}, + "span.kind" : "test", + "test.browser.driver" : "selenium", + "test.browser.driver_version" : ${content_meta_test_browser_driver_version}, + "test.browser.name" : "htmlunit", + "test.browser.version" : ${content_meta_test_browser_version}, + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.framework" : "junit5", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.is_rum_active" : "true", + "test.module" : "selenium", + "test.name" : "test_succeed_another", + "test.source.file" : "dummy_source_path", + "test.source.method" : "test_succeed_another()V", + "test.status" : "pass", + "test.suite" : "org.example.TestSucceedMultipleSelenium", + "test.type" : "browser", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "process_id" : ${content_metrics_process_id}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "name" : "junit.test", + "parent_id" : ${content_parent_id}, + "resource" : "org.example.TestSucceedMultipleSelenium.test_succeed_another", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "span_id" : ${content_span_id_2}, + "start" : ${content_start_3}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id}, + "trace_id" : ${content_trace_id_2} + }, + "type" : "test", + "version" : 2 +}, { + "content" : { + "duration" : ${content_duration_4}, + "error" : 0, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.profiling.ctx" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "component" : "junit", + "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", + "language" : "jvm", + "library_version" : ${content_meta_library_version}, + "runtime-id" : ${content_meta_runtime_id}, + "span.kind" : "test_session_end", + "test.command" : "selenium", + "test.framework" : "junit5", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.status" : "pass", + "test.type" : "test", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "process_id" : ${content_metrics_process_id} + }, + "name" : "junit.test_session", + "resource" : "selenium", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "start" : ${content_start_4}, + "test_session_id" : ${content_test_session_id} + }, + "type" : "test_session_end", + "version" : 1 +}, { + "content" : { + "duration" : ${content_duration_5}, + "error" : 0, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "component" : "junit", + "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", + "library_version" : ${content_meta_library_version}, + "span.kind" : "test_module_end", + "test.framework" : "junit5", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.module" : "selenium", + "test.status" : "pass", + "test.type" : "test", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} + }, + "name" : "junit.test_module", + "resource" : "selenium", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "start" : ${content_start_5}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id} + }, + "type" : "test_module_end", + "version" : 1 +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed/events.ftl index 3a69df5c8a8..8705fbf791a 100644 --- a/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed/events.ftl @@ -1,143 +1,155 @@ [ { - "type" : "test_suite_end", - "version" : 1, "content" : { - "test_session_id" : ${content_test_session_id}, - "test_module_id" : ${content_test_module_id}, - "test_suite_id" : ${content_test_suite_id}, - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "name" : "junit.test_suite", - "resource" : "org.example.TestSucceedSelenium", - "start" : ${content_start}, "duration" : ${content_duration}, "error" : 0, - "metrics" : { }, "meta" : { - "test.type" : "test", - "test.source.file" : "dummy_source_path", - "test.module" : "selenium", - "test.status" : "pass", - "test_session.name" : "session-name", - "env" : "none", + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "component" : "junit", "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", "library_version" : ${content_meta_library_version}, - "component" : "junit", "span.kind" : "test_suite_end", - "test.suite" : "org.example.TestSucceedSelenium", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" - } - } + "test.module" : "selenium", + "test.source.file" : "dummy_source_path", + "test.status" : "pass", + "test.suite" : "org.example.TestSucceedSelenium", + "test.type" : "test", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "name" : "junit.test_suite", + "resource" : "org.example.TestSucceedSelenium", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "start" : ${content_start}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id} + }, + "type" : "test_suite_end", + "version" : 1 }, { - "type" : "test", - "version" : 2, "content" : { - "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, - "test_session_id" : ${content_test_session_id}, - "test_module_id" : ${content_test_module_id}, - "test_suite_id" : ${content_test_suite_id}, - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "name" : "junit.test", - "resource" : "org.example.TestSucceedSelenium.test_succeed", - "start" : ${content_start_2}, "duration" : ${content_duration_2}, "error" : 0, - "metrics" : { - "process_id" : ${content_metrics_process_id}, - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "test.source.end" : 18, - "test.source.start" : 12 - }, "meta" : { - "test.browser.driver_version" : "3.141.59", + "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "test.source.file" : "dummy_source_path", - "test.source.method" : "test_succeed()V", - "test.module" : "selenium", - "test.status" : "pass", + "component" : "junit", + "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", "language" : "jvm", - "test.browser.name" : "htmlunit", - "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, - "test.name" : "test_succeed", - "span.kind" : "test", - "test.suite" : "org.example.TestSucceedSelenium", "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "browser", + "span.kind" : "test", "test.browser.driver" : "selenium", - "test.is_rum_active" : "true", - "test_session.name" : "session-name", - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", + "test.browser.driver_version" : "3.141.59", + "test.browser.name" : "htmlunit", "test.browser.version" : "2.70.0", - "_dd.profiling.ctx" : "test", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" - } - } + "test.is_rum_active" : "true", + "test.module" : "selenium", + "test.name" : "test_succeed", + "test.source.file" : "dummy_source_path", + "test.source.method" : "test_succeed()V", + "test.status" : "pass", + "test.suite" : "org.example.TestSucceedSelenium", + "test.type" : "browser", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "process_id" : ${content_metrics_process_id}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "name" : "junit.test", + "parent_id" : ${content_parent_id}, + "resource" : "org.example.TestSucceedSelenium.test_succeed", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "span_id" : ${content_span_id}, + "start" : ${content_start_2}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id}, + "trace_id" : ${content_trace_id} + }, + "type" : "test", + "version" : 2 }, { - "type" : "test_session_end", - "version" : 1, "content" : { - "test_session_id" : ${content_test_session_id}, - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "name" : "junit.test_session", - "resource" : "selenium", - "start" : ${content_start_3}, "duration" : ${content_duration_3}, "error" : 0, - "metrics" : { - "process_id" : ${content_metrics_process_id}, - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0 - }, "meta" : { - "test.type" : "test", + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "test.status" : "pass", - "test_session.name" : "session-name", - "language" : "jvm", - "env" : "none", + "component" : "junit", "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", + "language" : "jvm", "library_version" : ${content_meta_library_version}, - "component" : "junit", - "_dd.profiling.ctx" : "test", - "span.kind" : "test_session_end", "runtime-id" : ${content_meta_runtime_id}, + "span.kind" : "test_session_end", "test.command" : "selenium", + "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" - } - } + "test.status" : "pass", + "test.type" : "test", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "process_id" : ${content_metrics_process_id} + }, + "name" : "junit.test_session", + "resource" : "selenium", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "start" : ${content_start_3}, + "test_session_id" : ${content_test_session_id} + }, + "type" : "test_session_end", + "version" : 1 }, { - "type" : "test_module_end", - "version" : 1, "content" : { - "test_session_id" : ${content_test_session_id}, - "test_module_id" : ${content_test_module_id}, - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "name" : "junit.test_module", - "resource" : "selenium", - "start" : ${content_start_4}, "duration" : ${content_duration_4}, "error" : 0, - "metrics" : { }, "meta" : { - "test.type" : "test", - "test.module" : "selenium", - "test.status" : "pass", - "test_session.name" : "session-name", - "env" : "none", + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "component" : "junit", "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", "library_version" : ${content_meta_library_version}, - "component" : "junit", "span.kind" : "test_module_end", + "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" - } - } + "test.module" : "selenium", + "test.status" : "pass", + "test.type" : "test", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} + }, + "name" : "junit.test_module", + "resource" : "selenium", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "start" : ${content_start_4}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id} + }, + "type" : "test_module_end", + "version" : 1 } ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/events.ftl index 70eaa484b6c..dfe53578407 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/events.ftl @@ -4,6 +4,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", diff --git a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/events.ftl index 9c34a96537d..2365401dba8 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/events.ftl @@ -4,6 +4,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl index 522e3ac9d39..4381cbfb3b9 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl @@ -4,6 +4,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", @@ -55,6 +56,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -103,6 +105,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -131,6 +134,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -159,6 +163,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -187,6 +192,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -234,6 +240,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -288,6 +295,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -344,6 +352,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -400,6 +409,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -456,6 +466,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -474,6 +485,7 @@ "span.kind" : "test", "test.framework" : "junit4", "test.framework_version" : "4.10", + "test.has_failed_all_retries" : "true", "test.is_retry" : "true", "test.module" : ":test", "test.name" : "test_failed", @@ -512,6 +524,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_12}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -540,6 +553,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_13}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -568,6 +582,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_14}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl index e49cb9a3b42..24ebe86ca3c 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl @@ -4,6 +4,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -52,6 +53,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -80,6 +82,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -108,6 +111,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -136,6 +140,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -183,6 +188,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -237,6 +243,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", @@ -288,6 +295,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -316,6 +324,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -344,6 +353,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl index 0874b11cd8a..d4ec8450454 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl @@ -4,6 +4,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", @@ -55,6 +56,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -103,6 +105,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -131,6 +134,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -159,6 +163,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -187,6 +192,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -234,6 +240,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -288,6 +295,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -316,6 +324,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -344,6 +353,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/events.ftl index 5abb7f8ae4a..22ccaa7f4fc 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/events.ftl @@ -4,6 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -42,6 +43,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -70,6 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -98,6 +101,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -126,6 +130,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", @@ -166,6 +171,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -194,6 +200,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -222,6 +229,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/events.ftl index 4f0cc73702d..38cee90dd31 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/events.ftl @@ -4,6 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", @@ -44,6 +45,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -82,6 +84,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -110,6 +113,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -138,6 +142,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -166,6 +171,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -194,6 +200,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -222,6 +229,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl index 1080a120052..e691dd11c14 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl @@ -5,6 +5,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", @@ -54,6 +55,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -99,6 +101,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -127,6 +130,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -155,6 +159,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -183,6 +188,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -230,6 +236,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -282,6 +289,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -336,6 +344,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -364,6 +373,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -392,6 +402,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl index 6266b5460fc..a3674672a94 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl @@ -5,6 +5,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -50,6 +51,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -78,6 +80,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -106,6 +109,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -134,6 +138,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -181,6 +186,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -233,6 +239,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -288,6 +295,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", @@ -336,6 +344,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -364,6 +373,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -392,6 +402,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl index dbf6a26f838..23b60ac5d6d 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl @@ -4,6 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -49,6 +50,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -77,6 +79,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -105,6 +108,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -133,6 +137,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -180,6 +185,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -232,6 +238,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -279,6 +286,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -331,6 +339,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", @@ -379,6 +388,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -407,6 +417,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -435,6 +446,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_12}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl index 2784cff3f9a..c68bd51fc40 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl @@ -4,6 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", @@ -52,6 +53,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -97,6 +99,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -125,6 +128,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -153,6 +157,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -181,6 +186,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -228,6 +234,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -280,6 +287,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -327,6 +335,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -379,6 +388,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -407,6 +417,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -435,6 +446,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_12}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl index b3db0ec0ee8..73e33fb9041 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl @@ -4,6 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -49,6 +50,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -94,6 +96,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -141,6 +144,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -188,6 +192,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -240,6 +245,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -292,6 +298,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", @@ -340,6 +347,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -368,6 +376,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -396,6 +405,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -424,6 +434,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -452,6 +463,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_12}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -480,6 +492,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_13}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -508,6 +521,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_14}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -536,6 +550,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_15}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -564,6 +579,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_16}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -592,6 +608,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_17}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -620,6 +637,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_18}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -648,6 +666,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_19}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl index 91157d01c15..fabd39e6383 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl @@ -4,6 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", @@ -52,6 +53,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -97,6 +99,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -142,6 +145,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -189,6 +193,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -236,6 +241,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -288,6 +294,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -340,6 +347,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -368,6 +376,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -396,6 +405,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -424,6 +434,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -452,6 +463,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_12}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -480,6 +492,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_13}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -508,6 +521,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_14}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -536,6 +550,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_15}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -564,6 +579,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_16}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -592,6 +608,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_17}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -620,6 +637,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_18}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -648,6 +666,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_19}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl index 3e3557b36d7..81a424a8f40 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl @@ -5,6 +5,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", @@ -54,6 +55,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -99,6 +101,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -127,6 +130,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -155,6 +159,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -183,6 +188,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -230,6 +236,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -282,6 +289,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -336,6 +344,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -364,6 +373,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -392,6 +402,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl index cc896192d64..e2388b5df4a 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl @@ -5,6 +5,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", "env" : "integration-test", @@ -50,6 +51,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -78,6 +80,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -106,6 +109,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -134,6 +138,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -181,6 +186,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -233,6 +239,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -288,6 +295,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "gradle", @@ -336,6 +344,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -364,6 +373,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -392,6 +402,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 314f7f7af39..d66c7348644 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -88,7 +88,6 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { where: projectName | mavenVersion | expectedEvents | expectedCoverages | expectSuccess | testsSkipping | flakyRetries | jacocoCoverage | commandLineParams | minSupportedJavaVersion - "test_successful_maven_run" | "3.2.1" | 5 | 1 | true | true | false | true | [] | 8 "test_successful_maven_run" | "3.5.4" | 5 | 1 | true | true | false | true | [] | 8 "test_successful_maven_run" | "3.6.3" | 5 | 1 | true | true | false | true | [] | 8 "test_successful_maven_run" | "3.8.8" | 5 | 1 | true | true | false | true | [] | 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl index f0256077437..beb1b2883f0 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl @@ -4,6 +4,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", @@ -51,6 +52,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", "env" : "integration-test", @@ -96,6 +98,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default", "language" : "jvm", @@ -127,6 +130,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-compile", "language" : "jvm", @@ -158,6 +162,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testCompile", "language" : "jvm", @@ -189,6 +194,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-resources", "language" : "jvm", @@ -220,6 +226,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testResources", "language" : "jvm", @@ -251,6 +258,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -298,6 +306,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -352,6 +361,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -408,6 +418,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -464,6 +475,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_12}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -520,6 +532,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_13}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -538,6 +551,7 @@ "span.kind" : "test", "test.framework" : "junit4", "test.framework_version" : "4.13.2", + "test.has_failed_all_retries" : "true", "test.is_retry" : "true", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.name" : "test_failed", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl index bc499ce4b86..e3521cbff09 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl @@ -5,6 +5,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", @@ -54,6 +55,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", "env" : "integration-test", @@ -100,6 +102,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default", "language" : "jvm", @@ -131,6 +134,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-compile", "language" : "jvm", @@ -162,6 +166,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testCompile", "language" : "jvm", @@ -193,6 +198,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-resources", "language" : "jvm", @@ -224,6 +230,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testResources", "language" : "jvm", @@ -255,6 +262,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -282,7 +290,9 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id_2} + "process_id" : ${content_metrics_process_id_2}, + "test.source.end" : 18, + "test.source.start" : 7 }, "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceed", @@ -300,6 +310,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -329,7 +340,9 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id_2} + "process_id" : ${content_metrics_process_id_2}, + "test.source.end" : 12, + "test.source.start" : 9 }, "name" : "junit.test", "parent_id" : ${content_parent_id}, @@ -350,6 +363,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -381,7 +395,9 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id_2} + "process_id" : ${content_metrics_process_id_2}, + "test.source.end" : 17, + "test.source.start" : 14 }, "name" : "junit.test", "parent_id" : ${content_parent_id}, @@ -396,4 +412,4 @@ }, "type" : "test", "version" : 2 -} ] +} ] \ No newline at end of file diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl index 1d0548502f3..e9f52afdec2 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl @@ -5,6 +5,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", @@ -52,6 +53,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", "env" : "integration-test", @@ -96,6 +98,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-compile", "language" : "jvm", @@ -127,6 +130,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testCompile", "language" : "jvm", @@ -158,6 +162,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-resources", "language" : "jvm", @@ -189,6 +194,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testResources", "language" : "jvm", @@ -220,6 +226,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -267,6 +274,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -319,6 +327,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl index 894716aab40..502079cd201 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl @@ -4,6 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", @@ -50,6 +51,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", "env" : "integration-test", @@ -94,6 +96,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-compile", "language" : "jvm", @@ -125,6 +128,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testCompile", "language" : "jvm", @@ -156,6 +160,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-resources", "language" : "jvm", @@ -187,6 +192,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testResources", "language" : "jvm", @@ -218,6 +224,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -265,6 +272,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -318,6 +326,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl index f4950b0ecb3..532e639cd47 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl @@ -4,6 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", @@ -47,6 +48,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", "env" : "integration-test", @@ -88,6 +90,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default", "language" : "jvm", @@ -119,6 +122,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default", "language" : "jvm", @@ -150,6 +154,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-compile", "language" : "jvm", @@ -181,6 +186,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testCompile", "language" : "jvm", @@ -212,6 +218,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-resources", "language" : "jvm", @@ -243,6 +250,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testResources", "language" : "jvm", @@ -274,6 +282,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -318,6 +327,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl index 0c47cb63d8e..daad9434fc5 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl @@ -5,6 +5,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", @@ -54,6 +55,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", "env" : "integration-test", @@ -100,6 +102,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default", "language" : "jvm", @@ -131,6 +134,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-compile", "language" : "jvm", @@ -162,6 +166,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testCompile", "language" : "jvm", @@ -193,6 +198,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-resources", "language" : "jvm", @@ -224,6 +230,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testResources", "language" : "jvm", @@ -255,6 +262,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -302,6 +310,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -354,6 +363,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl index 3a0327e8653..e3521cbff09 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl @@ -5,6 +5,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", @@ -54,6 +55,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", "env" : "integration-test", @@ -100,6 +102,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default", "language" : "jvm", @@ -131,6 +134,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-compile", "language" : "jvm", @@ -162,6 +166,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testCompile", "language" : "jvm", @@ -193,6 +198,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-resources", "language" : "jvm", @@ -224,6 +230,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testResources", "language" : "jvm", @@ -255,6 +262,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -302,6 +310,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -354,6 +363,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl index 3a0327e8653..e3521cbff09 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl @@ -5,6 +5,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", @@ -54,6 +55,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", "env" : "integration-test", @@ -100,6 +102,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default", "language" : "jvm", @@ -131,6 +134,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-compile", "language" : "jvm", @@ -162,6 +166,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testCompile", "language" : "jvm", @@ -193,6 +198,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-resources", "language" : "jvm", @@ -224,6 +230,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testResources", "language" : "jvm", @@ -255,6 +262,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -302,6 +310,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -354,6 +363,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl index 88002802e5c..72b75564c5c 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl @@ -4,6 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", @@ -47,6 +48,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", "env" : "integration-test", @@ -88,6 +90,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-compile", "language" : "jvm", @@ -119,6 +122,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testCompile", "language" : "jvm", @@ -150,6 +154,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-resources", "language" : "jvm", @@ -181,6 +186,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testResources", "language" : "jvm", @@ -212,6 +218,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -259,6 +266,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl index c0752f10ee4..8f7034c33ba 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl @@ -4,6 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "component" : "cucumber", "env" : "integration-test", "language" : "jvm", @@ -37,6 +38,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", @@ -81,6 +83,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", "env" : "integration-test", @@ -123,6 +126,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default", "language" : "jvm", @@ -154,6 +158,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-compile", "language" : "jvm", @@ -185,6 +190,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testCompile", "language" : "jvm", @@ -216,6 +222,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-resources", "language" : "jvm", @@ -247,6 +254,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testResources", "language" : "jvm", @@ -278,6 +286,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "component" : "cucumber", "env" : "integration-test", "language" : "jvm", @@ -310,6 +319,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -354,6 +364,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -402,6 +413,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_12}, + "_dd.test.is_user_provided_service" : "true", "component" : "cucumber", "env" : "integration-test", "language" : "jvm", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl index 05f6e57c2ec..4726148dc8c 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl @@ -5,6 +5,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", @@ -54,6 +55,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.test.is_user_provided_service" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "maven", "env" : "integration-test", @@ -100,6 +102,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-prepare-agent", "language" : "jvm", @@ -131,6 +134,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-compile", "language" : "jvm", @@ -162,6 +166,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testCompile", "language" : "jvm", @@ -193,6 +198,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-resources", "language" : "jvm", @@ -224,6 +230,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.test.is_user_provided_service" : "true", "env" : "integration-test", "execution" : "default-testResources", "language" : "jvm", @@ -255,6 +262,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -302,6 +310,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit", @@ -354,6 +363,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, "component" : "junit",