diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2 index 561c6581ce8..a44d1f95e6d 100644 --- a/.circleci/config.continue.yml.j2 +++ b/.circleci/config.continue.yml.j2 @@ -696,6 +696,8 @@ jobs: <<: *tests resource_class: medium + environment: + - CI_AGENT_HOST=localhost docker: - image: << pipeline.parameters.docker_image >>:{{ docker_image_prefix }}8 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 674a41f8522..bca4b89eed3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,9 @@ variables: GRADLE_VERSION: "8.4" # must match gradle-wrapper.properties JAVA_BUILD_IMAGE_VERSION: "v25.01" REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations" + PROFILE_TESTS: + description: "Enable profiling of tests" + value: "false" default: tags: [ "arch:amd64" ] @@ -35,6 +38,10 @@ default: script: - echo "done" +.set_datadog_api_keys: &set_datadog_api_keys + - export DATADOG_API_KEY_PROD=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.DATADOG_API_KEY_PROD --with-decryption --query "Parameter.Value" --out text) + - export DATADOG_API_KEY_DDSTAGING=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.dd_api_key --with-decryption --query "Parameter.Value" --out text) + .gradle_build: &gradle_build image: ghcr.io/datadog/dd-trace-java-docker-build:${JAVA_BUILD_IMAGE_VERSION}-base stage: build @@ -177,12 +184,76 @@ muzzle-dep-report: - ./reports - '.gradle/daemon/*/*.out.log' +# In Gitlab, DD_* variables are set because the build runner is instrumented with Datadog telemetry +# To have a pristine environment for the tests, these variables are saved before the test run and restored afterwards +.prepare_test_env: &prepare_test_env + - export gitlabVariables=("DD_SERVICE" "DD_ENTITY_ID" "DD_SITE" "DD_ENV" "DD_DATACENTER" "DD_PARTITION" "DD_CLOUDPROVIDER") + - '[ ! -e pretest.env ] || rm pretest.env' + - | + for VARIABLE in "${gitlabVariables[@]}" + do + echo "export $VARIABLE=${!VARIABLE}" >> pretest.env + unset "$VARIABLE" + done + +.restore_pretest_env: &restore_pretest_env + - source pretest.env + +.test_job: + extends: .gradle_build + image: ghcr.io/datadog/dd-trace-java-docker-build:$testJvm + needs: [ build ] + stage: tests + variables: + BUILD_CACHE_TYPE: lib + GRADLE_PARAMS: "" + CONTINUE_ON_FAILURE: "false" + script: + - > + if [ "$PROFILE_TESTS" == "true" ] && [ "$testJvm" != "ibm8" ] && [ "$testJvm" != "oracle8" ]; + then + export PROFILER_COMMAND="-XX:StartFlightRecording=settings=profile,filename=/tmp/${CI_JOB_NAME_SLUG}.jfr,dumponexit=true"; + fi + - *prepare_test_env + - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms2G -Xmx2G $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' -Ddatadog.forkedMaxHeapSize=768M -Ddatadog.forkedMinHeapSize=128M" + - ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PtestJvm=$testJvm $GRADLE_ARGS --continue || $CONTINUE_ON_FAILURE + after_script: + - *restore_pretest_env + - *set_datadog_api_keys + - .circleci/collect_reports.sh + - if [ "$PROFILE_TESTS" == "true" ]; then .circleci/collect_profiles.sh; fi + - .circleci/collect_results.sh + - .circleci/upload_ciapp.sh tests $testJvm +# TODO Get APM Test Agent Trace Check Results + artifacts: + when: always + paths: + - ./reports.tar + - ./profiles.tar + - ./results + - '.gradle/daemon/*/*.out.log' + +agent_integration_tests: + extends: .test_job + variables: + testJvm: "8" + CI_AGENT_HOST: local-agent + GRADLE_TARGET: "traceAgentTest" + services: + - name: datadog/agent:7.34.0 + alias: local-agent + variables: + DD_APM_ENABLED: "true" + DD_BIND_HOST: "0.0.0.0" + DD_API_KEY: "invalid_key_but_this_is_fine" + required: extends: .fan_in needs: - spotless - muzzle - test_published_artifacts + - agent_integration_tests deploy_to_profiling_backend: stage: publish 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 e25d41f6402..4d43300118e 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 @@ -358,8 +358,10 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { // 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 + // def searchIndex = classfilePath.indexOf("/build/classes/groovy") + // def modulePath = classfilePath.substring(0, searchIndex) + // def submoduleName = classfilePath.substring(searchIndex + "/build/classes/groovy".length()).split("/")[1] + // def baseTemplatesPath = modulePath + "/src/" + submoduleName + "/resources/" + testcaseName // CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements) // return [:] diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java index 4de59bbef9b..28b94f42360 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java @@ -44,16 +44,18 @@ public void testSuiteStarted(final Description description) { if (isFeature(description)) { TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description); String testSuiteName = CucumberUtils.getTestSuiteNameForFeature(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - Collections.emptyList(), - false, - TestFrameworkInstrumentation.CUCUMBER, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + Collections.emptyList(), + false, + TestFrameworkInstrumentation.CUCUMBER, + null); } } @@ -61,7 +63,9 @@ public void testSuiteStarted(final Description description) { public void testSuiteFinished(final Description description) { if (isFeature(description)) { TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteFinish(suiteDescriptor, null); } } @@ -71,17 +75,19 @@ public void testStarted(final Description description) { String testName = CucumberUtils.getTestNameForScenario(description); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - new TestSuiteDescriptor(testSuiteName, null), - CucumberUtils.toTestDescriptor(description), - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - categories, - TestSourceData.UNKNOWN, - null, - executionHistories.get(description)); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestStart( + new TestSuiteDescriptor(testSuiteName, null), + CucumberUtils.toTestDescriptor(description), + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + categories, + TestSourceData.UNKNOWN, + null, + executionHistories.get(description)); recordFeatureFileCodeCoverage(description); } @@ -100,8 +106,9 @@ private static void recordFeatureFileCodeCoverage(Description scenarioDescriptio public void testFinished(final Description description) { TestDescriptor testDescriptor = CucumberUtils.toTestDescriptor(description); TestExecutionHistory executionHistory = executionHistories.get(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish( - testDescriptor, null, executionHistory); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestFinish(testDescriptor, null, executionHistory); } // same callback is executed both for test cases and test suites (for setup/teardown errors) @@ -111,11 +118,15 @@ public void testFailure(final Failure failure) { if (isFeature(description)) { TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description); Throwable throwable = failure.getException(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteFailure(suiteDescriptor, throwable); } else { TestDescriptor testDescriptor = CucumberUtils.toTestDescriptor(description); Throwable throwable = failure.getException(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestFailure(testDescriptor, throwable); } } @@ -132,10 +143,14 @@ public void testAssumptionFailure(final Failure failure) { Description description = failure.getDescription(); if (isFeature(description)) { TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteSkip(suiteDescriptor, reason); } else { TestDescriptor testDescriptor = CucumberUtils.toTestDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSkip(testDescriptor, reason); } } @@ -147,32 +162,40 @@ public void testIgnored(final Description description) { if (isFeature(description)) { TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description); String testSuiteName = CucumberUtils.getTestSuiteNameForFeature(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - Collections.emptyList(), - false, - TestFrameworkInstrumentation.CUCUMBER, - null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + Collections.emptyList(), + false, + TestFrameworkInstrumentation.CUCUMBER, + null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteFinish(suiteDescriptor, null); } else { String testSuiteName = CucumberUtils.getTestSuiteNameForScenario(description); String testName = CucumberUtils.getTestNameForScenario(description); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore( - new TestSuiteDescriptor(testSuiteName, null), - CucumberUtils.toTestDescriptor(description), - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - categories, - TestSourceData.UNKNOWN, - reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestIgnore( + new TestSuiteDescriptor(testSuiteName, null), + CucumberUtils.toTestDescriptor(description), + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + categories, + TestSourceData.UNKNOWN, + reason); } } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java index 5c9737b33a4..0ba9205314c 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java @@ -8,6 +8,7 @@ import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.agent.tooling.muzzle.Reference; import datadog.trace.api.civisibility.execution.TestExecutionHistory; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.InstrumentationContext; import java.util.Collections; import java.util.List; @@ -82,6 +83,8 @@ public static void addTracingListener( } } + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.CUCUMBER); + replacedNotifier.addListener( new CucumberTracingListener( InstrumentationContext.get(Description.class, TestExecutionHistory.class), children)); diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java index 81c701b841f..cb54018c5c8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java @@ -12,6 +12,7 @@ import datadog.trace.api.civisibility.InstrumentationBridge; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.telemetry.tag.SkipReason; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.cucumber.core.gherkin.Pickle; import java.util.List; @@ -83,7 +84,10 @@ public static Boolean run( @Advice.Argument(0) RunNotifier notifier) { TestIdentifier test = CucumberUtils.toTestIdentifier(description); - SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(test); + SkipReason skipReason = + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .skipReason(test); if (skipReason == null) { return null; } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java index 7c169002193..11bd3ec9040 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java @@ -12,6 +12,7 @@ import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.execution.TestExecutionHistory; import datadog.trace.api.civisibility.execution.TestExecutionPolicy; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.InstrumentationContext; import datadog.trace.instrumentation.junit4.CucumberUtils; import datadog.trace.instrumentation.junit4.JUnit4Utils; @@ -97,8 +98,9 @@ public static Boolean execute( Description description = CucumberUtils.getPickleRunnerDescription(pickleRunner); TestIdentifier testIdentifier = CucumberUtils.toTestIdentifier(description); TestExecutionPolicy executionPolicy = - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy( - testIdentifier, TestSourceData.UNKNOWN); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .executionPolicy(testIdentifier, TestSourceData.UNKNOWN); if (!executionPolicy.applicable()) { // retries not applicable, run original method return null; diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy index c5dfbb68c22..1d16617beaf 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy @@ -1,6 +1,7 @@ import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.instrumentation.junit4.CucumberTracingListener import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder @@ -211,7 +212,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { .map(f -> "classpath:" + f). collect(Collectors.joining(","))) - TestEventsHandlerHolder.start() + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.CUCUMBER) try { def result = runner.run(TestSucceedCucumber) if (expectSuccess) { @@ -224,7 +225,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } } } finally { - TestEventsHandlerHolder.stop() + TestEventsHandlerHolder.stop(TestFrameworkInstrumentation.CUCUMBER) } } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index 6ef3d88f843..46ee043c406 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.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}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -65,7 +65,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -85,7 +85,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -115,7 +115,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -135,7 +135,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -165,7 +165,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -185,7 +185,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -215,7 +215,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -235,7 +235,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -266,7 +266,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -287,7 +287,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -308,7 +308,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -322,7 +322,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -338,7 +338,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl index abfe2d738d3..670dc9c3a44 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -62,7 +62,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -82,7 +82,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -109,7 +109,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -129,7 +129,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -156,7 +156,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -176,7 +176,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -203,7 +203,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -223,7 +223,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -251,7 +251,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -272,7 +272,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -293,7 +293,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -307,7 +307,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -323,7 +323,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl index e9f20763f8e..5039ebefc3c 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.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}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -64,7 +64,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -84,7 +84,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -113,7 +113,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -133,7 +133,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -162,7 +162,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -182,7 +182,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -211,7 +211,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -231,7 +231,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -261,7 +261,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -282,7 +282,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -303,7 +303,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -317,7 +317,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -333,7 +333,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index 66e78a94c94..58f2dd7f314 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.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}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -65,7 +65,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -85,7 +85,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -115,7 +115,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -135,7 +135,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -165,7 +165,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -185,7 +185,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -215,7 +215,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -235,7 +235,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -266,7 +266,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -287,7 +287,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -308,7 +308,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -322,7 +322,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -338,7 +338,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl index e5451c45d76..34591f86c42 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -62,7 +62,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -82,7 +82,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -109,7 +109,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -129,7 +129,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -156,7 +156,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -176,7 +176,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -203,7 +203,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -223,7 +223,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -251,7 +251,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -272,7 +272,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -293,7 +293,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -307,7 +307,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -323,7 +323,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl index 63705497c7e..75082887a44 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -127,7 +127,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -153,7 +153,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -173,7 +173,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -199,7 +199,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -219,7 +219,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -246,7 +246,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -267,7 +267,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -288,7 +288,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -302,7 +302,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -318,7 +318,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/events.ftl index e7bc82f2a6e..b6cfe804f1f 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.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}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -62,7 +62,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -83,7 +83,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -104,7 +104,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -118,7 +118,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -134,7 +134,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/events.ftl index c30945b31ab..3b43ccbbbcd 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -102,7 +102,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -116,7 +116,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -132,7 +132,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl index 84ae7f50a94..372b1f06889 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -127,7 +127,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -153,7 +153,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -173,7 +173,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -197,7 +197,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -217,7 +217,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -243,7 +243,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -263,7 +263,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -289,7 +289,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -309,7 +309,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -333,7 +333,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -353,7 +353,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -377,7 +377,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -398,7 +398,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -420,7 +420,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_10}, @@ -434,7 +434,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -451,7 +451,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_11} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_11}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl index 84ed609243c..310806a3dd3 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -127,7 +127,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -153,7 +153,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -173,7 +173,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -197,7 +197,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -217,7 +217,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -243,7 +243,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -263,7 +263,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -289,7 +289,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -309,7 +309,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -333,7 +333,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -353,7 +353,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -377,7 +377,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -398,7 +398,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -420,7 +420,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_10}, @@ -434,7 +434,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -451,7 +451,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_11} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_11}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl index a8dbd324e27..b4a7577f49c 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -128,7 +128,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -149,7 +149,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -163,7 +163,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -179,7 +179,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/events.ftl index e2c2fe1550b..5134b0be663 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -127,7 +127,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -153,7 +153,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -174,7 +174,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -195,7 +195,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -209,7 +209,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -225,7 +225,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/events.ftl index a986c419569..a8c82c333f7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/empty_scenario_name.feature:EMPTY_NAME", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/empty_scenario_name.feature:EMPTY_NAME.EMPTY_NAME", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -101,7 +101,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -115,7 +115,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -130,7 +130,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/events.ftl index 25b6e9c7a8d..b81168a9990 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/empty_scenario_name.feature:EMPTY_NAME", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/empty_scenario_name.feature:EMPTY_NAME.LINE:7", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -101,7 +101,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -115,7 +115,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -130,7 +130,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl index 40d75f5acb1..556066e94d2 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.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}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -84,7 +84,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -104,7 +104,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -118,7 +118,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -133,7 +133,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl index badbf34c0ac..e143e3612d8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -38,7 +38,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -85,7 +85,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -108,7 +108,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -123,7 +123,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -141,7 +141,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl index 3078269bf29..eb109113f6d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -38,7 +38,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -84,7 +84,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -121,7 +121,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -139,7 +139,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl index 81d826acd57..5f90cb69a2b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -38,7 +38,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -84,7 +84,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -121,7 +121,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -139,7 +139,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl index d56cdd19fe4..b7ac919210b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -79,7 +79,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -95,7 +95,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3} }, - "name" : "junit.test_suite", + "name" : "cucumber.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_3}, @@ -112,7 +112,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -159,7 +159,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -179,7 +179,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -193,7 +193,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -208,7 +208,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl index 6df1d8a2f44..6eb0d793843 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic #1.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -79,7 +79,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -95,7 +95,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -112,7 +112,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic #2.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -179,7 +179,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -193,7 +193,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -208,7 +208,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/events.ftl index ecf34dc0965..0e17d12ca9d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/name_with_brackets.feature:This (Name) Has Bracket Characters", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/name_with_brackets.feature:This (Name) Has Bracket Characters.Addition (Has) Brackets Too", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -101,7 +101,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -115,7 +115,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -130,7 +130,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl index ecfa9f13d11..98c335df14c 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.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}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -64,7 +64,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -84,7 +84,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -113,7 +113,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -133,7 +133,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -162,7 +162,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -182,7 +182,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -211,7 +211,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -231,7 +231,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -261,7 +261,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -282,7 +282,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -303,7 +303,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -317,7 +317,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -333,7 +333,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl index 873b71b6552..a9f132db898 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.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}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -65,7 +65,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -85,7 +85,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -115,7 +115,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -135,7 +135,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -166,7 +166,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -187,7 +187,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -209,7 +209,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -223,7 +223,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -240,7 +240,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl index ad3d947ca17..e79c800340e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.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}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -64,7 +64,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -85,7 +85,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -121,7 +121,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -138,7 +138,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl index 8a75ade8bc0..65dbb7bdb6e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.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}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -64,7 +64,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -85,7 +85,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -106,7 +106,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -120,7 +120,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -136,7 +136,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/events.ftl index e68e6daa057..563b93d6bbb 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.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}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -83,7 +83,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -111,7 +111,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -131,7 +131,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -159,7 +159,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -179,7 +179,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -207,7 +207,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -227,7 +227,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -256,7 +256,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.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", @@ -277,7 +277,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -297,7 +297,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -311,7 +311,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -326,7 +326,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/events.ftl index 5d05ced5b68..48dbbfc04ee 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -80,7 +80,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -103,7 +103,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -123,7 +123,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -149,7 +149,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -169,7 +169,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -197,7 +197,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -217,7 +217,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -245,7 +245,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -265,7 +265,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -293,7 +293,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -313,7 +313,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -342,7 +342,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -362,7 +362,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -385,7 +385,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -406,7 +406,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -426,7 +426,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_10}, @@ -440,7 +440,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -455,7 +455,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_11} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_11}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/events.ftl index 3ec37f03dd6..918b5307ed8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -80,7 +80,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -103,7 +103,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -123,7 +123,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -149,7 +149,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions #3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -169,7 +169,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -192,7 +192,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions #4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -213,7 +213,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -233,7 +233,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -247,7 +247,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -262,7 +262,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl index ca8095518e5..ee9c5054418 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -80,7 +80,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -103,7 +103,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -123,7 +123,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -146,7 +146,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -166,7 +166,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -210,7 +210,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -230,7 +230,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -244,7 +244,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -259,7 +259,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl index 347251b38bb..505940e33e8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -80,7 +80,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -103,7 +103,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -123,7 +123,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -146,7 +146,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -166,7 +166,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -210,7 +210,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -230,7 +230,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -244,7 +244,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -259,7 +259,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl index b007b479917..d1ac6032827 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -101,7 +101,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -115,7 +115,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -130,7 +130,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy index 9e2209f1b6c..5f400d721ff 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy @@ -1,4 +1,5 @@ import datadog.trace.api.DisableTestTrace +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder import junit.runner.Version @@ -37,7 +38,7 @@ class JUnit413Test extends CiVisibilityInstrumentationTest { } private void runTests(Collection> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.start() + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4) try { Class[] array = tests.toArray(new Class[0]) def result = runner.run(array) @@ -51,7 +52,7 @@ class JUnit413Test extends CiVisibilityInstrumentationTest { } } } finally { - TestEventsHandlerHolder.stop() + TestEventsHandlerHolder.stop(TestFrameworkInstrumentation.JUNIT4) } } diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl index e0b54e4b12e..02d56eccc43 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -93,7 +93,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAfterClass", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -110,7 +110,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfterClass.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -184,7 +184,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfterClass.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl index 916bf7a309d..796df78720d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAfterParam", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfterParam.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfterParam.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl index 3285a104314..d9fe0e52f83 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAfter", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfter.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfter.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl index 8babbbea88b..7c471a91a82 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -93,7 +93,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedBeforeClass", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl index 4ab3b38a4ad..a0304404821 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedBeforeParam", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl index b3d66d51728..b7d2a82e8ff 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedBefore", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedBefore.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedBefore.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl index 2934d64a75e..7c73fee7a7b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedBeforeAfter", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeAfter.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -181,7 +181,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeAfter.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl index 1b469df92ab..da6c129f7a2 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedBeforeClassAfterClass", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeClassAfterClass.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -181,7 +181,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeClassAfterClass.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl index 8181de476b5..775fbc2395b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedBeforeParamAfterParam", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeParamAfterParam.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeParamAfterParam.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java index 04a7b05b9ba..9fe051f3c56 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java @@ -7,6 +7,7 @@ import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.civisibility.execution.TestExecutionHistory; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.InstrumentationContext; import java.util.Collections; import java.util.List; @@ -73,6 +74,8 @@ public static void addTracingListener( } } + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.MUNIT); + replacedNotifier.addListener( new MUnitTracingListener( InstrumentationContext.get(Description.class, TestExecutionHistory.class))); diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java index 56814b0a8b2..43194f1eee2 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java @@ -46,16 +46,18 @@ public void testSuiteStarted(final Description description) { Class testClass = description.getTestClass(); String testSuiteName = description.getClassName(); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - testClass, - categories, - false, - TestFrameworkInstrumentation.MUNIT, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + testClass, + categories, + false, + TestFrameworkInstrumentation.MUNIT, + null); } public void testSuiteFinished(final Description description) { @@ -67,7 +69,9 @@ public void testSuiteFinished(final Description description) { } TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteFinish(suiteDescriptor, null); } @Override @@ -76,25 +80,28 @@ public void testStarted(final Description description) { TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description); String testName = description.getMethodName(); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - suiteDescriptor, - testDescriptor, - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - categories, - JUnit4Utils.toTestSourceData(description), - null, - executionHistories.get(description)); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestStart( + suiteDescriptor, + testDescriptor, + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + categories, + JUnit4Utils.toTestSourceData(description), + null, + executionHistories.get(description)); } @Override public void testFinished(final Description description) { TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description); TestExecutionHistory executionHistory = executionHistories.get(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish( - testDescriptor, null, executionHistory); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestFinish(testDescriptor, null, executionHistory); } // same callback is executed both for test cases and test suites (for setup/teardown errors) @@ -106,10 +113,14 @@ public void testFailure(final Failure failure) { String testName = description.getMethodName(); if (Strings.isNotBlank(testName)) { TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestFailure(testDescriptor, throwable); } else { TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteFailure(suiteDescriptor, throwable); } } @@ -129,11 +140,15 @@ public void testAssumptionFailure(final Failure failure) { if (Strings.isNotBlank(testName)) { TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSkip(testDescriptor, reason); } else if (testClass != null) { TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteSkip(suiteDescriptor, reason); for (Description child : description.getChildren()) { testCaseIgnored(child); } @@ -152,20 +167,26 @@ public void testIgnored(final Description description) { // while newer versions don't TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - suiteDescriptor, - testDescriptor, - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - categories, - JUnit4Utils.toTestSourceData(description), - null, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestStart( + suiteDescriptor, + testDescriptor, + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + categories, + JUnit4Utils.toTestSourceData(description), + null, + null); } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(testDescriptor, null, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSkip(testDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestFinish(testDescriptor, null, null); } else if (testClass != null) { TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description); @@ -175,25 +196,31 @@ public void testIgnored(final Description description) { // there is a bug in MUnit 1.0.1+: start/finish events are not fired for skipped suites String testSuiteName = description.getClassName(); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - testClass, - categories, - false, - TestFrameworkInstrumentation.MUNIT, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + testClass, + categories, + false, + TestFrameworkInstrumentation.MUNIT, + null); } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteSkip(suiteDescriptor, null); for (Description child : description.getChildren()) { testCaseIgnored(child); } if (!suiteStarted) { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteFinish(suiteDescriptor, null); } } } @@ -213,16 +240,18 @@ private void testCaseIgnored(final Description description) { TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description); String testName = description.getMethodName(); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore( - suiteDescriptor, - testDescriptor, - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - categories, - JUnit4Utils.toTestSourceData(description), - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestIgnore( + suiteDescriptor, + testDescriptor, + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + categories, + JUnit4Utils.toTestSourceData(description), + null); } private static boolean isSuiteContainingChildren(final Description description) { diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java index 0126950be92..de6288d8fb8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java @@ -11,6 +11,7 @@ import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.execution.TestExecutionHistory; import datadog.trace.api.civisibility.execution.TestExecutionPolicy; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.InstrumentationContext; import datadog.trace.instrumentation.junit4.JUnit4Utils; import datadog.trace.instrumentation.junit4.MUnitUtils; @@ -91,8 +92,9 @@ public static Future apply( TestSourceData testSourceData = JUnit4Utils.toTestSourceData(description); TestExecutionPolicy executionPolicy = - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy( - testIdentifier, testSourceData); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .executionPolicy(testIdentifier, testSourceData); if (!executionPolicy.applicable()) { // retries not applicable, run original method return null; diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy index 4c47ac7bca3..19eb74ae243 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy @@ -1,5 +1,6 @@ import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff @@ -144,7 +145,7 @@ class MUnitTest extends CiVisibilityInstrumentationTest { } private void runTests(Collection> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.start() + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.MUNIT) try { Class[] array = tests.toArray(new Class[0]) def result = runner.run(array) @@ -158,7 +159,7 @@ class MUnitTest extends CiVisibilityInstrumentationTest { } } } finally { - TestEventsHandlerHolder.stop() + TestEventsHandlerHolder.stop(TestFrameworkInstrumentation.MUNIT) } } diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index d6b663ba666..3cc647b3962 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -139,7 +139,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -191,7 +191,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -243,7 +243,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -263,7 +263,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -295,7 +295,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -315,7 +315,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -348,7 +348,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl index 79bc536d296..b087d18e6ce 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -156,7 +156,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -185,7 +185,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -205,7 +205,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -234,7 +234,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -254,7 +254,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -283,7 +283,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -303,7 +303,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -333,7 +333,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl index 9d742115d5d..b2f81d70dc4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -189,7 +189,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -240,7 +240,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -260,7 +260,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -291,7 +291,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -343,7 +343,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index ea0af0a1e37..68a49579de4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -139,7 +139,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -191,7 +191,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -243,7 +243,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -263,7 +263,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -295,7 +295,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -315,7 +315,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -348,7 +348,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl index 22a1f754b1d..6d687f6ce16 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -156,7 +156,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -185,7 +185,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -205,7 +205,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -234,7 +234,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -254,7 +254,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -283,7 +283,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -303,7 +303,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -333,7 +333,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl index 266e6144c1b..b9aa7b96431 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -203,7 +203,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -231,7 +231,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -251,7 +251,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -279,7 +279,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -299,7 +299,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -328,7 +328,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/events.ftl index fd6c0cdf705..57ae4464214 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl index fefa5428dcb..05e8d25511a 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnitSlow", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnitSlow.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -181,7 +181,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnitSlow.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/events.ftl index 2db5a65169a..cee20aa46b2 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -203,7 +203,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -231,7 +231,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl index fecff1b380a..1e0c0b49ea1 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedAssumptionMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -131,7 +131,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAssumptionMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl index 88076b804c6..91cdec65340 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedAssumptionMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -132,7 +132,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAssumptionMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl index f479a9c9bf7..0062abe47c7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedThenSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -135,7 +135,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message_2}, @@ -185,7 +185,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -205,7 +205,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -232,7 +232,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed/events.ftl index dc8e3421f59..59b0e03f115 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -135,7 +135,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl index 829b39c272a..f342fa1944a 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -189,7 +189,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -240,7 +240,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -260,7 +260,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -291,7 +291,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -343,7 +343,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl index 155dcf123d3..686698bdfd5 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -141,7 +141,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -161,7 +161,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -193,7 +193,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -213,7 +213,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -246,7 +246,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl index b72db7bc168..5cc2916c4c9 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -140,7 +140,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl index b4ff261d152..31324d609f7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/events.ftl index ddd8c1d5e36..29851450ffe 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -135,7 +135,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -185,7 +185,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -205,7 +205,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -235,7 +235,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -255,7 +255,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -285,7 +285,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -305,7 +305,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -336,7 +336,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl index eb84ab78838..c7c0182bf44 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSkippedSuiteMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -132,7 +132,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedSuiteMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -152,7 +152,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -177,7 +177,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedSuiteMUnit.Calculator.subtract", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl index c737a3b8b61..ffc9f6f904c 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSkippedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -132,7 +132,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/events.ftl index 5fa9c5b5e53..76fee7dc3f4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -133,7 +133,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl index 998ea750c24..38e3756efcc 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -132,7 +132,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java index abd72ed85b9..99c07805562 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java @@ -10,6 +10,7 @@ import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.civisibility.execution.TestExecutionHistory; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.InstrumentationContext; import java.util.Collections; import java.util.List; @@ -114,6 +115,8 @@ public static void addTracingListener( } } + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4); + final TracingListener tracingListener = new JUnit4TracingListener( InstrumentationContext.get(Description.class, TestExecutionHistory.class)); diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java index 560c99f2a3f..c0dddc72226 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java @@ -13,6 +13,7 @@ import datadog.trace.api.civisibility.InstrumentationBridge; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.telemetry.tag.SkipReason; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Method; import java.util.List; @@ -93,7 +94,10 @@ public static Boolean runChild( } TestIdentifier test = JUnit4Utils.toTestIdentifier(description); - SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(test); + SkipReason skipReason = + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .skipReason(test); if (skipReason == null) { return null; } diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java index db57d2af4f1..90a04b81fdc 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java @@ -36,16 +36,18 @@ public void testSuiteStarted(final Description description) { Class testClass = description.getTestClass(); String testSuiteName = JUnit4Utils.getSuiteName(testClass, description); List categories = JUnit4Utils.getCategories(testClass, null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - testClass, - categories, - false, - TestFrameworkInstrumentation.JUNIT4, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + testClass, + categories, + false, + TestFrameworkInstrumentation.JUNIT4, + null); } public void testSuiteFinished(final Description description) { @@ -57,7 +59,9 @@ public void testSuiteFinished(final Description description) { } TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteFinish(suiteDescriptor, null); } @Override @@ -75,17 +79,19 @@ public void testStarted(final Description description) { List categories = JUnit4Utils.getCategories(testSourceData.getTestClass(), testSourceData.getTestMethod()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - suiteDescriptor, - testDescriptor, - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - testParameters, - categories, - testSourceData, - null, - executionHistories.get(description)); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestStart( + suiteDescriptor, + testDescriptor, + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + testParameters, + categories, + testSourceData, + null, + executionHistories.get(description)); } @Override @@ -96,8 +102,9 @@ public void testFinished(final Description description) { TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description); TestExecutionHistory executionHistory = executionHistories.get(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish( - testDescriptor, null, executionHistory); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestFinish(testDescriptor, null, executionHistory); } // same callback is executed both for test cases and test suites (for setup/teardown errors) @@ -111,11 +118,15 @@ public void testFailure(final Failure failure) { if (JUnit4Utils.isTestSuiteDescription(description)) { TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description); Throwable throwable = failure.getException(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteFailure(suiteDescriptor, throwable); } else { TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description); Throwable throwable = failure.getException(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestFailure(testDescriptor, throwable); } } @@ -136,7 +147,9 @@ public void testAssumptionFailure(final Failure failure) { if (JUnit4Utils.isTestSuiteDescription(description)) { TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteSkip(suiteDescriptor, reason); List testMethods = JUnit4Utils.getTestMethods(description.getTestClass()); for (Method testMethod : testMethods) { @@ -144,7 +157,9 @@ public void testAssumptionFailure(final Failure failure) { } } else { TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSkip(testDescriptor, reason); } } @@ -168,24 +183,30 @@ public void testIgnored(final Description description) { String testSuiteName = JUnit4Utils.getSuiteName(testClass, description); List categories = JUnit4Utils.getCategories(testClass, null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - testClass, - categories, - false, - TestFrameworkInstrumentation.JUNIT4, - null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + testClass, + categories, + false, + TestFrameworkInstrumentation.JUNIT4, + null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteSkip(suiteDescriptor, reason); List testMethods = JUnit4Utils.getTestMethods(testClass); for (Method testMethod : testMethods) { testIgnored(description, testMethod, reason); } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteFinish(suiteDescriptor, null); } } @@ -204,15 +225,17 @@ private void testIgnored(Description description, Method testMethod, String reas String testName = JUnit4Utils.getTestName(description, testMethod); String testParameters = JUnit4Utils.getParameters(description); List categories = JUnit4Utils.getCategories(testClass, testMethod); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore( - suiteDescriptor, - testDescriptor, - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - testParameters, - categories, - testSourceData, - reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestIgnore( + suiteDescriptor, + testDescriptor, + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + testParameters, + categories, + testSourceData, + reason); } } diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java index 699812f473d..db5b9de2b3c 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java @@ -4,14 +4,19 @@ import datadog.trace.api.civisibility.events.TestDescriptor; import datadog.trace.api.civisibility.events.TestEventsHandler; import datadog.trace.api.civisibility.events.TestSuiteDescriptor; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.util.AgentThreadFactory; +import datadog.trace.util.ConcurrentEnumMap; +import java.util.Map; public abstract class TestEventsHandlerHolder { - public static volatile TestEventsHandler TEST_EVENTS_HANDLER; + // store one handler per framework running + public static final Map< + TestFrameworkInstrumentation, TestEventsHandler> + HANDLERS = new ConcurrentEnumMap<>(TestFrameworkInstrumentation.class); static { - start(); Runtime.getRuntime() .addShutdownHook( AgentThreadFactory.newAgentThread( @@ -20,14 +25,27 @@ public abstract class TestEventsHandlerHolder { false)); } - public static void start() { - TEST_EVENTS_HANDLER = InstrumentationBridge.createTestEventsHandler("junit", null, null); + public static synchronized void start(TestFrameworkInstrumentation framework) { + TestEventsHandler handler = HANDLERS.get(framework); + if (handler == null) { + HANDLERS.put( + framework, + InstrumentationBridge.createTestEventsHandler( + framework.name().toLowerCase(), null, null)); + } + } + + public static synchronized void stop() { + for (TestEventsHandler handler : HANDLERS.values()) { + handler.close(); + } + HANDLERS.clear(); } - public static void stop() { - if (TEST_EVENTS_HANDLER != null) { - TEST_EVENTS_HANDLER.close(); - TEST_EVENTS_HANDLER = null; + public static synchronized void stop(TestFrameworkInstrumentation framework) { + TestEventsHandler handler = HANDLERS.remove(framework); + if (handler != null) { + handler.close(); } } diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java index ad25f41a9f5..2ea225acd7e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java @@ -12,6 +12,7 @@ import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.execution.TestExecutionHistory; import datadog.trace.api.civisibility.execution.TestExecutionPolicy; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.InstrumentationContext; import datadog.trace.instrumentation.junit4.JUnit4Utils; import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder; @@ -101,8 +102,9 @@ public static Boolean apply( TestIdentifier testIdentifier = JUnit4Utils.toTestIdentifier(description); TestSourceData testSourceData = JUnit4Utils.toTestSourceData(description); TestExecutionPolicy executionPolicy = - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy( - testIdentifier, testSourceData); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .executionPolicy(testIdentifier, testSourceData); if (!executionPolicy.applicable()) { // retries not applicable, run original method return null; diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy index 858525cf44a..95b107ac860 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy @@ -1,6 +1,7 @@ import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff @@ -206,7 +207,7 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { } private void runTests(Collection> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.start() + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4) try { Class[] array = tests.toArray(new Class[0]) def result = runner.run(array) @@ -220,7 +221,7 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { } } } finally { - TestEventsHandlerHolder.stop() + TestEventsHandlerHolder.stop(TestFrameworkInstrumentation.JUNIT4) } } diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl index 56f0f7bc7e5..bf5a9b16202 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -91,7 +91,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedSuiteSetUpAssumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -108,7 +108,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSuiteSetUpAssumption.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/events.ftl index 688f384da6e..069f98d0a33 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestAssumptionAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestAssumptionAndSucceed.test_fail_assumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -182,7 +182,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestAssumptionAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/events.ftl index 4df8e35cb84..f228618076a 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestAssumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestAssumption.test_fail_assumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-is-not-retried/events.ftl index 4df8e35cb84..f228618076a 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-is-not-retried/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-is-not-retried/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestAssumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestAssumption.test_fail_assumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index 516d508c6ed..71c4f6a6c4e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -140,7 +140,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -160,7 +160,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -193,7 +193,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -213,7 +213,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -246,7 +246,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -266,7 +266,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_4}, @@ -299,7 +299,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -319,7 +319,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_5}, @@ -353,7 +353,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl index 023d9693ea4..29c6b99263d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -240,7 +240,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -260,7 +260,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -291,7 +291,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -343,7 +343,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl index 61b5c17029f..59ae568ed34 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -139,7 +139,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -191,7 +191,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -243,7 +243,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -263,7 +263,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_4}, @@ -295,7 +295,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -315,7 +315,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_5}, @@ -348,7 +348,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index 79833fb556e..44eda3db707 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -140,7 +140,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -160,7 +160,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -193,7 +193,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -213,7 +213,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -246,7 +246,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -266,7 +266,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_4}, @@ -299,7 +299,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -319,7 +319,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_5}, @@ -353,7 +353,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl index ad5549d4098..e2cdbd32b77 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -240,7 +240,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -260,7 +260,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -291,7 +291,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -343,7 +343,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/events.ftl index 413fe494fa5..4ac19a90342 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -207,7 +207,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -237,7 +237,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -257,7 +257,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -287,7 +287,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -307,7 +307,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -338,7 +338,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl index e00887f9a6e..5738514496d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -91,7 +91,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedWithCategories", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -108,7 +108,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedWithCategories.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/events.ftl index c54160aa958..9abbcef90a0 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -91,7 +91,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSkippedClass", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -108,7 +108,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedClass.test_class_another_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -156,7 +156,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -184,7 +184,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedClass.test_class_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed-parameterized/events.ftl index 16ad8909c37..faabbeed521 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed-parameterized/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -139,7 +139,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed/events.ftl index ae7473fb54f..c383ea63517 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/events.ftl index 183ebd55f7e..79965d6fca7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -139,7 +139,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -239,7 +239,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -259,7 +259,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -289,7 +289,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -309,7 +309,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -341,7 +341,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -361,7 +361,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -394,7 +394,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -414,7 +414,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -442,7 +442,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-parameterized-test/events.ftl index 04e8ce5d13b..1cb21d5428e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-parameterized-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -185,7 +185,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-test/events.ftl index 1fc739404f1..847528d5ac7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/events.ftl index bf4a41fb58a..b975f569af5 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -207,7 +207,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -237,7 +237,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -257,7 +257,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -286,7 +286,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -306,7 +306,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -333,7 +333,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-parameterized-test/events.ftl index ee4dc7e2c68..787eafaf2be 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-parameterized-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -140,7 +140,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -160,7 +160,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -191,7 +191,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -242,7 +242,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -262,7 +262,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -291,7 +291,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -342,7 +342,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -362,7 +362,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -393,7 +393,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-slow-test/events.ftl index 145ff353be0..b940fe5e3c3 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-slow-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedSlow", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSlow.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSlow.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-test/events.ftl index fd1c1c4f6ba..164e2e5ce5e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -207,7 +207,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -237,7 +237,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-very-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-very-slow-test/events.ftl index 5fa609d27f7..c3c740336cd 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-very-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-very-slow-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedVerySlow", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedVerySlow.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/events.ftl index 3162990ad35..e68859daa7b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestError", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestError.test_error", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/events.ftl index 10536415451..ae6b890a34e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedExpectedException", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedExpectedException.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed-then-succeed/events.ftl index 6f70ee03e59..ab4a93d264d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed-then-succeed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedThenSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceed.test_failed_then_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceed.test_failed_then_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -241,7 +241,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceed.test_failed_then_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -261,7 +261,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -290,7 +290,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceed.test_failed_then_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/events.ftl index 661f29b1b5f..b176152eb27 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/events.ftl index afd2b7f73e9..9376657a938 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestInheritance", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestInheritance.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl index 73997857d7c..94d7015d89b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl @@ -7,7 +7,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -30,7 +30,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -45,7 +45,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -63,7 +63,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -78,7 +78,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -98,7 +98,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -116,7 +116,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -146,7 +146,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -167,7 +167,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -195,7 +195,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/events.ftl index 7e827553f98..422b3b18bee 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/events.ftl @@ -7,7 +7,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -30,7 +30,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 2 }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -45,7 +45,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -63,7 +63,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 2 }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -78,7 +78,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -98,7 +98,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -116,7 +116,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -145,7 +145,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -166,7 +166,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -195,7 +195,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -216,7 +216,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -243,7 +243,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl index 3558acc6407..d1f99bb1d38 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -29,7 +29,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -43,7 +43,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -61,7 +61,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -76,7 +76,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -96,7 +96,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedUnskippable", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -114,7 +114,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -143,7 +143,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedUnskippable.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl index 5f71a4ce72e..7c7aeee8465 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -29,7 +29,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -43,7 +43,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -61,7 +61,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -76,7 +76,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -97,7 +97,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedUnskippableSuite", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -115,7 +115,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -145,7 +145,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedUnskippableSuite.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl index 78437a267fc..af5a875b578 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -29,7 +29,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -43,7 +43,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -61,7 +61,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -76,7 +76,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -96,7 +96,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedUnskippable", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -114,7 +114,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -144,7 +144,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedUnskippable.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-legacy/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-legacy/events.ftl index 92e57d5e1c4..dd30cfb0dd6 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-legacy/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-legacy/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedLegacy", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedLegacy.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl index 7250b4e4ab3..f430383c1ed 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -153,7 +153,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -173,7 +173,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedAndSkipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -190,7 +190,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -218,7 +218,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndSkipped.test_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -238,7 +238,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -265,7 +265,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndSkipped.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized-junit-params/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized-junit-params/events.ftl index ee4f4df2b2a..44b36eeaedd 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized-junit-params/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized-junit-params/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestParameterizedJUnitParams", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedJUnitParams.test_parameterized(1, 2, 3) ", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedJUnitParams.test_parameterized(2, 2, 4) ", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/events.ftl index fde34b8d71a..fa6deac24be 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl index 7735299037c..aad8bea1746 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -139,7 +139,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -191,7 +191,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -243,7 +243,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -263,7 +263,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_4}, @@ -295,7 +295,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -315,7 +315,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_5}, @@ -348,7 +348,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl index 55665fad7e0..213c6d68746 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -142,7 +142,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -162,7 +162,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -195,7 +195,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -215,7 +215,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -249,7 +249,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl index 9daaa37af8e..7d409ad2c0d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -141,7 +141,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl index 7b619a55bd5..c04408d2f7b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -141,7 +141,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -161,7 +161,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -190,7 +190,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl index f640662a917..025d821ae88 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -139,7 +139,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-failed/events.ftl index 54ef0c228dc..172e56130b4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -156,7 +156,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -207,7 +207,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -238,7 +238,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -258,7 +258,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_4}, @@ -289,7 +289,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -309,7 +309,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_5}, @@ -341,7 +341,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-parameterized/events.ftl index e86722f0024..e07bca9d382 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-parameterized/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -191,7 +191,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -244,7 +244,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -264,7 +264,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -297,7 +297,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -317,7 +317,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -351,7 +351,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -371,7 +371,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -399,7 +399,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped-is-not-retried/events.ftl index 627c97c1ca6..e7819cfce43 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped-is-not-retried/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped-is-not-retried/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSkipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkipped.test_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/events.ftl index 627c97c1ca6..e7819cfce43 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSkipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkipped.test_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-impacted/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-impacted/events.ftl index d3f0ae0144a..162972b01d1 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-impacted/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-impacted/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-kotlin/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-kotlin/events.ftl index a4497dd5338..6418003fa58 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-kotlin/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-kotlin/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedKotlin", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedKotlin.single document (without provider) deserialized from json", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/events.ftl index fd625dd73f8..9fd17137313 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedParameterizedKotlin", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedParameterizedKotlin.single document (without provider) deserialized from json", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedParameterizedKotlin.single document (without provider) deserialized from json", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/events.ftl index 9398aa4d35a..b25ca72bbd4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/events.ftl index a840fd08a08..d1c3a0417e0 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -203,7 +203,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -230,7 +230,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl index 9f1b2dc967c..3642a69aa29 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedAndSkipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndSkipped.test_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -182,7 +182,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndSkipped.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl index 56775ffe512..80acf4f7075 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -203,7 +203,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -230,7 +230,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -249,7 +249,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -269,7 +269,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -286,7 +286,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -313,7 +313,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/events.ftl index 777199a2a14..dad2541a054 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedSuite$FirstTest", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSuite$FirstTest.testAddition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -153,7 +153,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -173,7 +173,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedSuite$SecondTest", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -190,7 +190,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -217,7 +217,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSuite$SecondTest.testSubtraction", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl index 68b1a414def..ba17c451913 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -93,7 +93,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedSuiteSetup", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl index 5d0707527fe..3ab49ee78bf 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -93,7 +93,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedSuiteTearDown", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -110,7 +110,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSuiteTearDown.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -184,7 +184,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSuiteTearDown.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java index 381de8066a7..e346ef9425e 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java @@ -65,16 +65,18 @@ private void containerExecutionStarted(final TestDescriptor suiteDescriptor) { String testSuiteName = CucumberUtils.getFeatureName(suiteDescriptor); List tags = suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - testFramework, - testFrameworkVersion, - null, - tags, - false, - TestFrameworkInstrumentation.CUCUMBER, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + testFramework, + testFrameworkVersion, + null, + tags, + false, + TestFrameworkInstrumentation.CUCUMBER, + null); } private void containerExecutionFinished( @@ -87,16 +89,22 @@ private void containerExecutionFinished( if (throwable != null) { if (JUnitPlatformUtils.isAssumptionFailure(throwable)) { String reason = throwable.getMessage(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteSkip(suiteDescriptor, reason); for (TestDescriptor child : suiteDescriptor.getChildren()) { executionSkipped(child, reason); } } else { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteFailure(suiteDescriptor, throwable); } } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteFinish(suiteDescriptor, null); } private void testCaseExecutionStarted(final TestDescriptor testDescriptor) { @@ -115,17 +123,19 @@ private void testResourceExecutionStarted( String testName = names.getRight(); List tags = testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - suiteDescriptor, - testDescriptor, - testName, - testFramework, - testFrameworkVersion, - null, - tags, - TestSourceData.UNKNOWN, - null, - TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestStart( + suiteDescriptor, + testDescriptor, + testName, + testFramework, + testFrameworkVersion, + null, + tags, + TestSourceData.UNKNOWN, + null, + TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); CoveragePerTestBridge.recordCoverage(classpathResourceName); } @@ -143,16 +153,20 @@ private void testResourceExecutionFinished( Throwable throwable = testExecutionResult.getThrowable().orElse(null); if (throwable != null) { if (JUnitPlatformUtils.isAssumptionFailure(throwable)) { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip( - testDescriptor, throwable.getMessage()); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSkip(testDescriptor, throwable.getMessage()); } else { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestFailure(testDescriptor, throwable); } } TestExecutionHistory executionHistory = TestEventsHandlerHolder.getExecutionHistory(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish( - testDescriptor, null, executionHistory); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestFinish(testDescriptor, null, executionHistory); } @Override @@ -172,15 +186,17 @@ private void testResourceExecutionSkipped( String testName = names.getRight(); List tags = testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore( - suiteDescriptor, - testDescriptor, - testName, - testFramework, - testFrameworkVersion, - null, - tags, - TestSourceData.UNKNOWN, - reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestIgnore( + suiteDescriptor, + testDescriptor, + testName, + testFramework, + testFrameworkVersion, + null, + tags, + TestSourceData.UNKNOWN, + reason); } } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java index 1e04e935a1f..1be7ac3effc 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java @@ -21,7 +21,9 @@ public abstract class CucumberUtils { static { TestDataFactory.register( - "cucumber", CucumberUtils::toTestIdentifier, d -> TestSourceData.UNKNOWN); + JUnitPlatformUtils.ENGINE_ID_CUCUMBER, + CucumberUtils::toTestIdentifier, + d -> TestSourceData.UNKNOWN); } public static @Nullable String getCucumberVersion(TestEngine cucumberEngine) { diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java index 08a1843ab2d..eef612bea28 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java @@ -11,7 +11,9 @@ import datadog.trace.api.Config; import datadog.trace.api.civisibility.InstrumentationBridge; import datadog.trace.api.civisibility.config.TestIdentifier; +import datadog.trace.api.civisibility.events.TestEventsHandler; import datadog.trace.api.civisibility.telemetry.tag.SkipReason; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; import java.util.Set; @@ -90,7 +92,10 @@ public static void shouldBeSkipped( return; } - if (TestEventsHandlerHolder.TEST_EVENTS_HANDLER == null) { + TestEventsHandler testEventsHandler = + TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.CUCUMBER); + + if (testEventsHandler == null) { // should only happen in integration tests // because we cannot avoid instrumenting ourselves return; @@ -101,7 +106,7 @@ public static void shouldBeSkipped( return; } - SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(test); + SkipReason skipReason = testEventsHandler.skipReason(test); if (skipReason == null) { return; } 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 77320253f2b..d28a995025d 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 @@ -221,8 +221,6 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } protected void runFeatures(List classpathFeatures, boolean parallel, boolean expectSuccess = true) { - TestEventsHandlerHolder.startForcefully() - DiscoverySelector[] selectors = new DiscoverySelector[classpathFeatures.size()] for (i in 0.. hierarchyMatcher() { @Override public String[] helperClassNames() { return new String[] { - parentPackageName + ".TestEventsHandlerHolder", parentPackageName + ".JUnitPlatformUtils", + parentPackageName + ".TestEventsHandlerHolder", packageName + ".JUnit5OrderUtils", packageName + ".FailFastClassOrderer", packageName + ".FailFastMethodOrderer", @@ -90,7 +91,8 @@ public static void onGetClassOrdererExit( classOrderer = Optional.of( new FailFastClassOrderer( - TestEventsHandlerHolder.TEST_EVENTS_HANDLER, classOrderer.orElse(null))); + TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT5), + classOrderer.orElse(null))); } else { throw new IllegalArgumentException("Unknown test order: " + testOrder); } @@ -118,7 +120,8 @@ public static void onGetMethodOrdererExit( methodOrderer = Optional.of( new FailFastMethodOrderer( - TestEventsHandlerHolder.TEST_EVENTS_HANDLER, methodOrderer.orElse(null))); + TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT5), + methodOrderer.orElse(null))); } else { throw new IllegalArgumentException("Unknown test order: " + testOrder); } diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy index 03e2ed6c2f7..016442eb5b8 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy @@ -1,4 +1,5 @@ import datadog.trace.api.DisableTestTrace +import datadog.trace.api.civisibility.CIConstants import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder import org.example.* @@ -82,8 +83,6 @@ class JUnit58Test extends CiVisibilityInstrumentationTest { } private static void runTests(List> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.startForcefully() - DiscoverySelector[] selectors = new DiscoverySelector[tests.size()] for (i in 0.. testEventsHandler = + TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.SPOCK); + + if (testEventsHandler == null) { // should only happen in integration tests // because we cannot avoid instrumenting ourselves return; @@ -120,8 +125,7 @@ public static void shouldBeSkipped( if (featureIdentifier == null) { return; } - SkipReason skipReason = - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(featureIdentifier); + SkipReason skipReason = testEventsHandler.skipReason(featureIdentifier); if (skipReason == null) { return; } @@ -146,7 +150,7 @@ public static void shouldBeSkipped( if (test == null) { return; } - SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(test); + SkipReason skipReason = testEventsHandler.skipReason(test); if (skipReason == null) { return; } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java index 449ee106326..d11a512a750 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java @@ -64,16 +64,18 @@ private void containerExecutionStarted(final TestDescriptor suiteDescriptor) { testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName(); List tags = suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - testFramework, - testFrameworkVersion, - testClass, - tags, - false, - TestFrameworkInstrumentation.SPOCK, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + testFramework, + testFrameworkVersion, + testClass, + tags, + false, + TestFrameworkInstrumentation.SPOCK, + null); } private void containerExecutionFinished( @@ -87,18 +89,24 @@ private void containerExecutionFinished( if (JUnitPlatformUtils.isAssumptionFailure(throwable)) { String reason = throwable.getMessage(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteSkip(suiteDescriptor, reason); for (TestDescriptor child : suiteDescriptor.getChildren()) { executionSkipped(child, reason); } } else { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteFailure(suiteDescriptor, throwable); } } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteFinish(suiteDescriptor, null); } private void testCaseExecutionStarted(final TestDescriptor testDescriptor) { @@ -116,17 +124,19 @@ private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSou testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); TestSourceData testSourceData = SpockUtils.toTestSourceData(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - suiteDescriptor, - testDescriptor, - displayName, - testFramework, - testFrameworkVersion, - testParameters, - tags, - testSourceData, - null, - TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestStart( + suiteDescriptor, + testDescriptor, + displayName, + testFramework, + testFrameworkVersion, + testParameters, + tags, + testSourceData, + null, + TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); } private void testCaseExecutionFinished( @@ -137,21 +147,25 @@ private void testCaseExecutionFinished( } } - private static void testMethodExecutionFinished( + private void testMethodExecutionFinished( TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) { Throwable throwable = testExecutionResult.getThrowable().orElse(null); if (throwable != null) { if (JUnitPlatformUtils.isAssumptionFailure(throwable)) { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip( - testDescriptor, throwable.getMessage()); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSkip(testDescriptor, throwable.getMessage()); } else { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestFailure(testDescriptor, throwable); } } TestExecutionHistory executionHistory = TestEventsHandlerHolder.getExecutionHistory(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish( - testDescriptor, null, executionHistory); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestFinish(testDescriptor, null, executionHistory); } @Override @@ -179,23 +193,29 @@ private void containerExecutionSkipped( List tags = suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - testFramework, - testFrameworkVersion, - testClass, - tags, - false, - TestFrameworkInstrumentation.SPOCK, - null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + testFramework, + testFrameworkVersion, + testClass, + tags, + false, + TestFrameworkInstrumentation.SPOCK, + null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteSkip(suiteDescriptor, reason); for (TestDescriptor child : suiteDescriptor.getChildren()) { executionSkipped(child, reason); } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteFinish(suiteDescriptor, null); } private void testMethodExecutionSkipped( @@ -207,15 +227,17 @@ private void testMethodExecutionSkipped( testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); TestSourceData testSourceData = SpockUtils.toTestSourceData(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore( - suiteDescriptor, - testDescriptor, - displayName, - testFramework, - testFrameworkVersion, - testParameters, - tags, - testSourceData, - reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestIgnore( + suiteDescriptor, + testDescriptor, + displayName, + testFramework, + testFrameworkVersion, + testParameters, + tags, + testSourceData, + reason); } } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java index 2c2899f1cc0..436aa78ac33 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java @@ -36,7 +36,10 @@ public class SpockUtils { METHOD_HANDLES.method("org.spockframework.runtime.model.TestTag", "getValue"); static { - TestDataFactory.register("spock", SpockUtils::toTestIdentifier, SpockUtils::toTestSourceData); + TestDataFactory.register( + JUnitPlatformUtils.ENGINE_ID_SPOCK, + SpockUtils::toTestIdentifier, + SpockUtils::toTestSourceData); } /* diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy index 67fbc23b3fe..518e611f3b9 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy @@ -211,8 +211,6 @@ class SpockTest extends CiVisibilityInstrumentationTest { } private static void runTests(List> classes, boolean expectSuccess = true) { - TestEventsHandlerHolder.startForcefully() - DiscoverySelector[] selectors = new DiscoverySelector[classes.size()] for (i in 0.. contextStore = InstrumentationContext.get(TestDescriptor.class, Object.class); - TestEventsHandlerHolder.setContextStores( - (ContextStore) contextStore, (ContextStore) contextStore); - TestEventsHandlerHolder.start(); + TestEventsHandlerHolder.start( + testEngine, (ContextStore) contextStore, (ContextStore) contextStore); } } @@ -94,9 +94,7 @@ public static class JUnit5Advice { public static void addTracingListener( @Advice.This TestEngine testEngine, @Advice.Argument(value = 0, readOnly = false) ExecutionRequest executionRequest) { - String testEngineClassName = testEngine.getClass().getName(); - if (testEngineClassName.startsWith("io.cucumber") - || testEngineClassName.startsWith("org.spockframework")) { + if (JUnitPlatformUtils.engineToFramework(testEngine) != TestFrameworkInstrumentation.JUNIT5) { // Cucumber and Spock have dedicated instrumentations. // We can only filter out calls to their engines at runtime, // since they do not declare their own "execute" method, diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java index 39a44f76c0a..212130a6235 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java @@ -12,7 +12,9 @@ import datadog.trace.api.Config; import datadog.trace.api.civisibility.InstrumentationBridge; import datadog.trace.api.civisibility.config.TestIdentifier; +import datadog.trace.api.civisibility.events.TestEventsHandler; import datadog.trace.api.civisibility.telemetry.tag.SkipReason; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; import java.util.Set; @@ -86,7 +88,10 @@ public static void shouldBeSkipped( return; } - if (TestEventsHandlerHolder.TEST_EVENTS_HANDLER == null) { + TestEventsHandler testEventsHandler = + TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT5); + + if (testEventsHandler == null) { // should only happen in integration tests // because we cannot avoid instrumenting ourselves return; @@ -96,7 +101,7 @@ public static void shouldBeSkipped( if (test == null) { return; } - SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(test); + SkipReason skipReason = testEventsHandler.skipReason(test); if (skipReason == null) { return; } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java index ba9382c6f9f..3c81cb3f45d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java @@ -4,6 +4,7 @@ import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestSourceData; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; @@ -12,12 +13,14 @@ import java.lang.invoke.MethodHandle; import java.lang.reflect.Method; import java.util.List; +import java.util.ListIterator; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.junit.platform.commons.JUnitException; import org.junit.platform.commons.util.ClassLoaderUtils; import org.junit.platform.commons.util.ReflectionUtils; import org.junit.platform.engine.TestDescriptor; +import org.junit.platform.engine.TestEngine; import org.junit.platform.engine.TestSource; import org.junit.platform.engine.UniqueId; import org.junit.platform.engine.support.descriptor.ClassSource; @@ -38,6 +41,9 @@ public abstract class JUnitPlatformUtils { private static final Logger LOGGER = LoggerFactory.getLogger(JUnitPlatformUtils.class); + public static final String ENGINE_ID_CUCUMBER = "cucumber"; + public static final String ENGINE_ID_SPOCK = "spock"; + private JUnitPlatformUtils() {} private static final MethodHandles METHOD_HANDLES = @@ -205,4 +211,38 @@ public static TestDescriptor getSuiteDescriptor(TestDescriptor testDescriptor) { } return testDescriptor; } + + public static TestFrameworkInstrumentation engineToFramework(TestEngine testEngine) { + String testEngineClassName = testEngine.getClass().getName(); + if (testEngineClassName.startsWith("io.cucumber")) { + return TestFrameworkInstrumentation.CUCUMBER; + } else if (testEngineClassName.startsWith("org.spockframework")) { + return TestFrameworkInstrumentation.SPOCK; + } else { + return TestFrameworkInstrumentation.JUNIT5; + } + } + + public static String getEngineId(TestDescriptor testDescriptor) { + UniqueId uniqueId = testDescriptor.getUniqueId(); + List segments = uniqueId.getSegments(); + ListIterator it = segments.listIterator(segments.size()); + while (it.hasPrevious()) { + UniqueId.Segment segment = it.previous(); + if ("engine".equals(segment.getType())) { + return segment.getValue(); + } + } + return null; + } + + public static TestFrameworkInstrumentation engineIdToFramework(String engineId) { + if (ENGINE_ID_CUCUMBER.equals(engineId)) { + return TestFrameworkInstrumentation.CUCUMBER; + } else if (ENGINE_ID_SPOCK.equals(engineId)) { + return TestFrameworkInstrumentation.SPOCK; + } else { + return TestFrameworkInstrumentation.JUNIT5; + } + } } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java index cb209741bb1..cfffdcb708c 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java @@ -5,15 +5,21 @@ import datadog.trace.api.civisibility.InstrumentationBridge; import datadog.trace.api.civisibility.events.TestEventsHandler; import datadog.trace.api.civisibility.execution.TestExecutionHistory; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.ContextStore; import datadog.trace.util.AgentThreadFactory; +import datadog.trace.util.ConcurrentEnumMap; +import java.util.Map; import org.junit.platform.engine.TestDescriptor; +import org.junit.platform.engine.TestEngine; public abstract class TestEventsHandlerHolder { - public static volatile TestEventsHandler TEST_EVENTS_HANDLER; - private static ContextStore SUITE_STORE; - private static ContextStore TEST_STORE; + // store one handler per framework running + public static final Map< + TestFrameworkInstrumentation, TestEventsHandler> + HANDLERS = new ConcurrentEnumMap<>(TestFrameworkInstrumentation.class); + private static volatile ContextStore EXECUTION_HISTORY_STORE; @@ -26,17 +32,6 @@ public abstract class TestEventsHandlerHolder { false)); } - public static synchronized void setContextStores( - ContextStore suiteStore, - ContextStore testStore) { - if (SUITE_STORE == null) { - SUITE_STORE = suiteStore; - } - if (TEST_STORE == null) { - TEST_STORE = testStore; - } - } - public static synchronized void setExecutionHistoryStore( ContextStore executionHistoryStore) { if (EXECUTION_HISTORY_STORE == null) { @@ -59,26 +54,25 @@ public static TestExecutionHistory getExecutionHistory(TestDescriptor testDescri } } - public static synchronized void start() { - if (TEST_EVENTS_HANDLER == null) { - TEST_EVENTS_HANDLER = - InstrumentationBridge.createTestEventsHandler("junit", SUITE_STORE, TEST_STORE); - } - } - - // used by instrumentation tests - public static synchronized void startForcefully() { - if (SUITE_STORE != null && TEST_STORE != null) { - TEST_EVENTS_HANDLER = - InstrumentationBridge.createTestEventsHandler("junit", SUITE_STORE, TEST_STORE); + public static synchronized void start( + TestEngine testEngine, + ContextStore suiteStore, + ContextStore testStore) { + TestFrameworkInstrumentation framework = JUnitPlatformUtils.engineToFramework(testEngine); + TestEventsHandler handler = HANDLERS.get(framework); + if (handler == null) { + handler = + InstrumentationBridge.createTestEventsHandler( + framework.name().toLowerCase(), suiteStore, testStore); + HANDLERS.put(framework, handler); } } public static synchronized void stop() { - if (TEST_EVENTS_HANDLER != null) { - TEST_EVENTS_HANDLER.close(); - TEST_EVENTS_HANDLER = null; + for (TestEventsHandler handler : HANDLERS.values()) { + handler.close(); } + HANDLERS.clear(); } private TestEventsHandlerHolder() {} diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java index 32874780b13..24f794b83dd 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java @@ -65,16 +65,18 @@ private void containerExecutionStarted(final TestDescriptor suiteDescriptor) { testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName(); List tags = suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - testFramework, - testFrameworkVersion, - testClass, - tags, - false, - TestFrameworkInstrumentation.JUNIT5, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + testFramework, + testFrameworkVersion, + testClass, + tags, + false, + TestFrameworkInstrumentation.JUNIT5, + null); } private void containerExecutionFinished( @@ -87,16 +89,22 @@ private void containerExecutionFinished( if (throwable != null) { if (JUnitPlatformUtils.isAssumptionFailure(throwable)) { String reason = throwable.getMessage(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteSkip(suiteDescriptor, reason); for (TestDescriptor child : suiteDescriptor.getChildren()) { executionSkipped(child, reason); } } else { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteFailure(suiteDescriptor, throwable); } } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteFinish(suiteDescriptor, null); } private void testCaseExecutionStarted(final TestDescriptor testDescriptor) { @@ -116,17 +124,19 @@ private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSou testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); TestSourceData testSourceData = JUnitPlatformUtils.toTestSourceData(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - suiteDescriptor, - testDescriptor, - testName, - testFramework, - testFrameworkVersion, - testParameters, - tags, - testSourceData, - null, - TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestStart( + suiteDescriptor, + testDescriptor, + testName, + testFramework, + testFrameworkVersion, + testParameters, + tags, + testSourceData, + null, + TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); } private void testCaseExecutionFinished( @@ -137,21 +147,25 @@ private void testCaseExecutionFinished( } } - private static void testMethodExecutionFinished( + private void testMethodExecutionFinished( TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) { Throwable throwable = testExecutionResult.getThrowable().orElse(null); if (throwable != null) { if (JUnitPlatformUtils.isAssumptionFailure(throwable)) { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip( - testDescriptor, throwable.getMessage()); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSkip(testDescriptor, throwable.getMessage()); } else { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestFailure(testDescriptor, throwable); } } TestExecutionHistory executionHistory = TestEventsHandlerHolder.getExecutionHistory(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish( - testDescriptor, null, executionHistory); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestFinish(testDescriptor, null, executionHistory); } @Override @@ -180,23 +194,29 @@ private void containerExecutionSkipped( List tags = suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - testFramework, - testFrameworkVersion, - testClass, - tags, - false, - TestFrameworkInstrumentation.JUNIT5, - null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + testFramework, + testFrameworkVersion, + testClass, + tags, + false, + TestFrameworkInstrumentation.JUNIT5, + null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteSkip(suiteDescriptor, reason); for (TestDescriptor child : suiteDescriptor.getChildren()) { executionSkipped(child, reason); } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteFinish(suiteDescriptor, null); } private void testMethodExecutionSkipped( @@ -210,15 +230,17 @@ private void testMethodExecutionSkipped( testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); TestSourceData testSourceData = JUnitPlatformUtils.toTestSourceData(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore( - suiteDescriptor, - testDescriptor, - testName, - testFramework, - testFrameworkVersion, - testParameters, - tags, - testSourceData, - reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestIgnore( + suiteDescriptor, + testDescriptor, + testName, + testFramework, + testFrameworkVersion, + testParameters, + tags, + testSourceData, + reason); } } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java index 53bdd76a58f..21aa292daac 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java @@ -14,6 +14,7 @@ import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.execution.TestExecutionPolicy; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.instrumentation.junit5.JUnitPlatformUtils; import datadog.trace.instrumentation.junit5.TestDataFactory; @@ -112,10 +113,6 @@ public static class ExecutionAdvice { @SuppressFBWarnings("NP_BOOLEAN_RETURN_NULL") @Advice.OnMethodEnter(skipOn = Boolean.class) public static Boolean execute(@Advice.This HierarchicalTestExecutorService.TestTask testTask) { - if (TestEventsHandlerHolder.TEST_EVENTS_HANDLER == null) { - // is possible when running tracer's instrumentation tests - return null; - } if (CallDepthThreadLocalMap.getCallDepth(HierarchicalTestExecutorService.TestTask.class) != 0) { @@ -135,10 +132,20 @@ public static Boolean execute(@Advice.This HierarchicalTestExecutorService.TestT return null; } + String engineId = JUnitPlatformUtils.getEngineId(testDescriptor); + TestFrameworkInstrumentation framework = JUnitPlatformUtils.engineIdToFramework(engineId); + + if (TestEventsHandlerHolder.HANDLERS.get(framework) == null) { + // is possible when running tracer's instrumentation tests + return null; + } + TestIdentifier testIdentifier = TestDataFactory.createTestIdentifier(testDescriptor); TestSourceData testSource = TestDataFactory.createTestSourceData(testDescriptor); TestExecutionPolicy executionPolicy = - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy(testIdentifier, testSource); + TestEventsHandlerHolder.HANDLERS + .get(framework) + .executionPolicy(testIdentifier, testSource); if (!executionPolicy.applicable()) { return null; } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java index 99d7e294b7c..019b4a6b4dd 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java @@ -51,7 +51,7 @@ public ElementMatcher hierarchyMatcher() { @Override public String[] helperClassNames() { return new String[] { - parentPackageName + ".TestEventsHandlerHolder", + parentPackageName + ".JUnitPlatformUtils", parentPackageName + ".TestEventsHandlerHolder", }; } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy index ffd7578cc4e..655cf3b2367 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy @@ -244,8 +244,6 @@ class JUnit5Test extends CiVisibilityInstrumentationTest { } protected void runTests(List> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.startForcefully() - DiscoverySelector[] selectors = new DiscoverySelector[tests.size()] for (i in 0..> tests) { - TestEventsHandlerHolder.startForcefully() - DiscoverySelector[] selectors = new DiscoverySelector[tests.size()] for (i in 0.. - // print output.utf8String - // } - agentContainer.start() - agentContainerHost = agentContainer.getHost() - agentContainerPort = agentContainer.getMappedPort(datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_AGENT_PORT) - } - File tmpDir = File.createTempDir() tmpDir.deleteOnExit() socketPath = new File(tmpDir, "socket") @@ -101,6 +61,7 @@ class DDApiIntegrationTest extends DDSpecification { } def setup() { + tracer = CoreTracer.builder().writer(new ListWriter()).build() span = tracer.buildSpan("fakeOperation").start() Thread.sleep(1) span.finish() @@ -111,15 +72,12 @@ class DDApiIntegrationTest extends DDSpecification { } def cleanupSpec() { - if (agentContainer) { - agentContainer.stop() - } - process.destroy() + process?.destroy() } def beforeTest(boolean enableV05) { MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS) - HttpUrl agentUrl = HttpUrl.get(String.format("http://%s:%d", agentContainerHost, agentContainerPort)) + HttpUrl agentUrl = HttpUrl.get(Config.get().getAgentUrl()) OkHttpClient httpClient = OkHttpUtils.buildHttpClient(agentUrl, 5000) discovery = new DDAgentFeaturesDiscovery(httpClient, monitoring, agentUrl, enableV05, true) api = new DDAgentApi(httpClient, agentUrl, discovery, monitoring, false) @@ -143,7 +101,7 @@ class DDApiIntegrationTest extends DDSpecification { assert 200 == response.status() assert response.success() assert discovery.getTraceEndpoint() == "${version}/traces" - assert endpoint.get() == "http://${agentContainerHost}:${agentContainerPort}/${version}/traces" + assert endpoint.get() == "${Config.get().getAgentUrl()}/${version}/traces" assert agentResponse.get()["rate_by_service"] instanceof Map where: @@ -166,7 +124,7 @@ class DDApiIntegrationTest extends DDSpecification { assert 200 == response.status() assert response.success() assert discovery.getTraceEndpoint() == "${version}/traces" - assert endpoint.get() == "http://${agentContainerHost}:${agentContainerPort}/${version}/traces" + assert endpoint.get() == "${Config.get().getAgentUrl()}/${version}/traces" assert agentResponse.get()["rate_by_service"] instanceof Map where: diff --git a/dd-trace-core/src/traceAgentTest/groovy/DataStreamsIntegrationTest.groovy b/dd-trace-core/src/traceAgentTest/groovy/DataStreamsIntegrationTest.groovy index 5ed81af35c3..526fa6b785f 100644 --- a/dd-trace-core/src/traceAgentTest/groovy/DataStreamsIntegrationTest.groovy +++ b/dd-trace-core/src/traceAgentTest/groovy/DataStreamsIntegrationTest.groovy @@ -8,21 +8,16 @@ import datadog.trace.api.datastreams.StatsPoint import datadog.trace.common.metrics.EventListener import datadog.trace.common.metrics.OkHttpSink import datadog.trace.core.datastreams.DefaultDataStreamsMonitoring -import datadog.trace.test.util.DDSpecification import okhttp3.HttpUrl import spock.lang.Ignore -import spock.lang.Requires import spock.util.concurrent.PollingConditions import java.util.concurrent.CopyOnWriteArrayList import static datadog.trace.common.metrics.EventListener.EventType.OK -@Requires({ - "true" == System.getenv("CI") -}) @Ignore("The agent in CI doesn't have a valid API key. Unlike metrics and traces, data streams fails in this case") -class DataStreamsIntegrationTest extends DDSpecification { +class DataStreamsIntegrationTest extends AbstractTraceAgentTest { def "Sending stats bucket to agent should notify with OK event"() { given: @@ -49,10 +44,10 @@ class DataStreamsIntegrationTest extends DDSpecification { } when: - def dataStreams = new DefaultDataStreamsMonitoring(sink, sharedCommunicationObjects.featuresDiscovery, timeSource, { traceConfig }, Config.get()) + def dataStreams = new DefaultDataStreamsMonitoring(sink, sharedCommunicationObjects.featuresDiscovery(Config.get()), timeSource, { traceConfig }, Config.get()) dataStreams.start() - dataStreams.accept(new StatsPoint("testType", "testGroup", "testTopic", 1, 2, timeSource.currentTimeNanos, 0, 0, null)) - timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 5, timeSource.currentTimeNanos, 0, 0, 0, null)) + timeSource.advance(Config.get().getDataStreamsBucketDurationNanoseconds()) dataStreams.report() then: diff --git a/dd-trace-core/src/traceAgentTest/groovy/MetricsIntegrationTest.groovy b/dd-trace-core/src/traceAgentTest/groovy/MetricsIntegrationTest.groovy index bc921bfe54e..fa96bd90218 100644 --- a/dd-trace-core/src/traceAgentTest/groovy/MetricsIntegrationTest.groovy +++ b/dd-trace-core/src/traceAgentTest/groovy/MetricsIntegrationTest.groovy @@ -1,14 +1,13 @@ - import datadog.communication.ddagent.DDAgentFeaturesDiscovery import datadog.communication.http.OkHttpUtils +import datadog.trace.api.Config import datadog.trace.api.WellKnownTags import datadog.trace.common.metrics.AggregateMetric import datadog.trace.common.metrics.EventListener import datadog.trace.common.metrics.MetricKey import datadog.trace.common.metrics.OkHttpSink import datadog.trace.common.metrics.SerializingMetricWriter -import datadog.trace.test.util.DDSpecification -import spock.lang.Requires +import okhttp3.HttpUrl import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.CountDownLatch @@ -16,19 +15,15 @@ import java.util.concurrent.atomic.AtomicLongArray import static datadog.trace.common.metrics.EventListener.EventType.OK import static java.util.concurrent.TimeUnit.SECONDS -import okhttp3.HttpUrl -@Requires({ - "true" == System.getenv("CI") -}) -class MetricsIntegrationTest extends DDSpecification { +class MetricsIntegrationTest extends AbstractTraceAgentTest { def "send metrics to trace agent should notify with OK event"() { setup: def latch = new CountDownLatch(1) def listener = new BlockingListener(latch) - def agentUrl = "http://localhost:8126" + def agentUrl = Config.get().getAgentUrl() OkHttpSink sink = new OkHttpSink(OkHttpUtils.buildHttpClient(HttpUrl.parse(agentUrl), 5000L), agentUrl, DDAgentFeaturesDiscovery.V6_METRICS_ENDPOINT, true, false, [:]) sink.register(listener) diff --git a/dd-trace-core/src/traceAgentTest/groovy/TraceMapperRealAgentTest.groovy b/dd-trace-core/src/traceAgentTest/groovy/TraceMapperRealAgentTest.groovy index 66f3244013e..b82e1f4a9d1 100644 --- a/dd-trace-core/src/traceAgentTest/groovy/TraceMapperRealAgentTest.groovy +++ b/dd-trace-core/src/traceAgentTest/groovy/TraceMapperRealAgentTest.groovy @@ -1,5 +1,6 @@ import datadog.communication.ddagent.DDAgentFeaturesDiscovery import datadog.communication.http.OkHttpUtils +import datadog.trace.api.Config import datadog.trace.api.StatsDClient import datadog.trace.common.writer.PayloadDispatcherImpl import datadog.trace.common.writer.ddagent.DDAgentApi @@ -7,36 +8,33 @@ import datadog.trace.common.writer.ddagent.DDAgentMapperDiscovery import datadog.trace.core.CoreSpan import datadog.trace.core.monitor.HealthMetrics import datadog.trace.core.monitor.MonitoringImpl -import datadog.trace.test.util.DDSpecification import okhttp3.HttpUrl import okhttp3.OkHttpClient -import spock.lang.Requires -import spock.lang.Shared import java.util.concurrent.TimeUnit import static TraceGenerator.generateRandomTraces -@Requires({ - "true" == System.getenv("CI") -}) -class TraceMapperRealAgentTest extends DDSpecification { +class TraceMapperRealAgentTest extends AbstractTraceAgentTest { - @Shared - HttpUrl agentUrl = HttpUrl.get("http://localhost:8126") - @Shared - OkHttpClient client = OkHttpUtils.buildHttpClient(agentUrl, 30_000) + OkHttpClient client + MonitoringImpl monitoring + DDAgentFeaturesDiscovery v05Discovery + DDAgentFeaturesDiscovery v04Discovery + DDAgentApi v05Api + DDAgentApi v04Api - @Shared - MonitoringImpl monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS) - @Shared - DDAgentFeaturesDiscovery v05Discovery = new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, true, true) - @Shared - DDAgentFeaturesDiscovery v04Discovery = new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, false, true) - @Shared - DDAgentApi v05Api = new DDAgentApi(client, agentUrl, v05Discovery, monitoring, false) - @Shared - DDAgentApi v04Api = new DDAgentApi(client, agentUrl, v04Discovery, monitoring, false) + def setup() { + def agentUrl = HttpUrl.parse(Config.get().getAgentUrl()) + + client = OkHttpUtils.buildHttpClient(agentUrl, 30_000) + monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS) + + v05Discovery = new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, true, true) + v04Discovery = new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, false, true) + v05Api = new DDAgentApi(client, agentUrl, v05Discovery, monitoring, false) + v04Api = new DDAgentApi(client, agentUrl, v04Discovery, monitoring, false) + } def "send random traces"() { setup: diff --git a/internal-api/build.gradle b/internal-api/build.gradle index b91842be14b..60b3581db97 100644 --- a/internal-api/build.gradle +++ b/internal-api/build.gradle @@ -166,6 +166,7 @@ excludedClassesCoverage += [ "datadog.trace.util.ClassNameTrie.Builder", "datadog.trace.util.ClassNameTrie.JavaGenerator", "datadog.trace.util.CollectionUtils", + "datadog.trace.util.ConcurrentEnumMap", "datadog.trace.util.MethodHandles", "datadog.trace.util.PidHelper", "datadog.trace.util.PidHelper.Fallback", diff --git a/internal-api/src/main/java/datadog/trace/util/ConcurrentEnumMap.java b/internal-api/src/main/java/datadog/trace/util/ConcurrentEnumMap.java new file mode 100644 index 00000000000..1fcc3440686 --- /dev/null +++ b/internal-api/src/main/java/datadog/trace/util/ConcurrentEnumMap.java @@ -0,0 +1,187 @@ +package datadog.trace.util; + +import java.util.AbstractMap; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicReferenceArray; +import javax.annotation.Nonnull; + +public class ConcurrentEnumMap, V> implements Map { + + private final K[] enumConstants; + private final AtomicReferenceArray values; + + public ConcurrentEnumMap(Class enumClass) { + this.enumConstants = enumClass.getEnumConstants(); + this.values = new AtomicReferenceArray<>(enumConstants.length); + } + + private int indexOf(Object key) { + if (key == null) { + throw new NullPointerException("Key must not be null"); + } + if (key.getClass() != enumConstants[0].getDeclaringClass()) { + throw new IllegalArgumentException("Key has wrong enum type"); + } + @SuppressWarnings("unchecked") + K castKey = (K) key; + return castKey.ordinal(); + } + + @Override + public V get(Object key) { + int idx = indexOf(key); + return values.get(idx); + } + + @Override + public V put(K key, V value) { + int idx = indexOf(key); + return values.getAndSet(idx, value); + } + + @Override + public void putAll(@Nonnull Map m) { + for (Map.Entry e : m.entrySet()) { + put(e.getKey(), e.getValue()); + } + } + + @Override + public V remove(Object key) { + int idx = indexOf(key); + return values.getAndSet(idx, null); + } + + @Override + public V putIfAbsent(@Nonnull K key, V value) { + int idx = indexOf(key); + while (true) { + V existing = values.get(idx); + if (existing != null) { + return existing; + } + if (values.compareAndSet(idx, null, value)) { + return null; + } + } + } + + @Override + public boolean remove(@Nonnull Object key, Object value) { + int idx = indexOf(key); + V cur = values.get(idx); + if (cur == null || !cur.equals(value)) { + return false; + } + return values.compareAndSet(idx, cur, null); + } + + @Override + public boolean replace(@Nonnull K key, @Nonnull V oldValue, @Nonnull V newValue) { + int idx = indexOf(key); + return values.compareAndSet(idx, oldValue, newValue); + } + + @Override + public V replace(@Nonnull K key, @Nonnull V value) { + int idx = indexOf(key); + while (true) { + V cur = values.get(idx); + if (cur == null) { + return null; + } + if (values.compareAndSet(idx, cur, value)) { + return cur; + } + } + } + + @Override + public int size() { + int count = 0; + for (int i = 0; i < values.length(); i++) { + if (values.get(i) != null) { + count++; + } + } + return count; + } + + @Override + public boolean isEmpty() { + for (int i = 0; i < values.length(); i++) { + if (values.get(i) != null) { + return false; + } + } + return true; + } + + @Override + public boolean containsKey(Object key) { + return get(key) != null; + } + + @Override + public boolean containsValue(Object value) { + for (int i = 0; i < values.length(); i++) { + V v = values.get(i); + if (v != null && v.equals(value)) { + return true; + } + } + return false; + } + + @Override + public void clear() { + for (int i = 0; i < values.length(); i++) { + values.set(i, null); + } + } + + @Nonnull + @Override + public Set keySet() { + Set keys = EnumSet.noneOf(enumConstants[0].getDeclaringClass()); + for (int i = 0; i < values.length(); i++) { + if (values.get(i) != null) { + keys.add(enumConstants[i]); + } + } + return Collections.unmodifiableSet(keys); + } + + @Nonnull + @Override + public Collection values() { + List list = new ArrayList<>(); + for (int i = 0; i < values.length(); i++) { + V value = values.get(i); + if (value != null) { + list.add(value); + } + } + return Collections.unmodifiableList(list); + } + + @Nonnull + @Override + public Set> entrySet() { + Set> entrySet = new java.util.HashSet<>(); + for (int i = 0; i < enumConstants.length; i++) { + V value = values.get(i); + if (value != null) { + K key = enumConstants[i]; + entrySet.add(new AbstractMap.SimpleEntry<>(key, value)); + } + } + return Collections.unmodifiableSet(entrySet); + } +}