diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java index d511ca89d28..5131c654258 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java @@ -187,7 +187,9 @@ private static BuildSystemSession.Factory buildSystemSessionFactory( repoServices.gitDataUploader.startOrObserveGitDataUpload(); - TestDecorator testDecorator = new TestDecoratorImpl(buildSystemName, repoServices.ciTags); + String sessionName = services.config.getCiVisibilitySessionName(); + TestDecorator testDecorator = + new TestDecoratorImpl(buildSystemName, sessionName, startCommand, repoServices.ciTags); String signalServerHost = services.config.getCiVisibilitySignalServerHost(); int signalServerPort = services.config.getCiVisibilitySignalServerPort(); @@ -223,7 +225,11 @@ private static TestFrameworkSession.Factory childTestFrameworkSessionFactory( long parentProcessSessionId = ProcessHierarchyUtils.getParentSessionId(); long parentProcessModuleId = ProcessHierarchyUtils.getParentModuleId(); - TestDecorator testDecorator = new TestDecoratorImpl(component, repoServices.ciTags); + String sessionName = services.config.getCiVisibilitySessionName(); + String testCommand = services.config.getCiVisibilityTestCommand(); + TestDecorator testDecorator = + new TestDecoratorImpl(component, sessionName, testCommand, repoServices.ciTags); + ExecutionStrategy executionStrategy = new ExecutionStrategy(services.config, executionSettings); return new ProxyTestSession( @@ -250,7 +256,10 @@ private static TestFrameworkSession.Factory headlessTestFrameworkEssionFactory( return (String projectName, String component, Long startTime) -> { repoServices.gitDataUploader.startOrObserveGitDataUpload(); - TestDecorator testDecorator = new TestDecoratorImpl(component, repoServices.ciTags); + String sessionName = services.config.getCiVisibilitySessionName(); + TestDecorator testDecorator = + new TestDecoratorImpl(component, sessionName, projectName, repoServices.ciTags); + ExecutionStrategy executionStrategy = new ExecutionStrategy(services.config, executionSettings); return new HeadlessTestSession( @@ -272,7 +281,11 @@ private static CIVisibility.SessionFactory manualApiSessionFactory( CiVisibilityServices services) { return (String projectName, Path projectRoot, String component, Long startTime) -> { CiVisibilityRepoServices repoServices = services.repoServices(projectRoot); - TestDecorator testDecorator = new TestDecoratorImpl(component, repoServices.ciTags); + + String sessionName = services.config.getCiVisibilitySessionName(); + TestDecorator testDecorator = + new TestDecoratorImpl(component, sessionName, projectName, repoServices.ciTags); + ExecutionSettings executionSettings = repoServices.executionSettingsFactory.create(JvmInfo.CURRENT_JVM, null); CiVisibilityCoverageServices.Child coverageServices = diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java index 3d3f7d4f367..117fdb90447 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java @@ -1,6 +1,7 @@ package datadog.trace.civisibility.config; import datadog.trace.api.Config; +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestMetadata; import datadog.trace.api.git.GitInfo; @@ -79,19 +80,16 @@ private TracerEnvironment buildTracerEnvironment( } } - /* - * IMPORTANT: JVM and OS properties should match tags - * set in datadog.trace.civisibility.decorator.TestDecoratorImpl - */ + CiVisibilityWellKnownTags wellKnownTags = config.getCiVisibilityWellKnownTags(); return builder .service(config.getServiceName()) .env(config.getEnv()) .repositoryUrl(gitInfo.getRepositoryURL()) .branch(gitInfo.getBranch()) .sha(gitInfo.getCommit().getSha()) - .osPlatform(System.getProperty("os.name")) - .osArchitecture(System.getProperty("os.arch")) - .osVersion(System.getProperty("os.version")) + .osPlatform(wellKnownTags.getOsPlatform().toString()) + .osArchitecture(wellKnownTags.getOsArch().toString()) + .osVersion(wellKnownTags.getOsVersion().toString()) .runtimeName(jvmInfo.getName()) .runtimeVersion(jvmInfo.getVersion()) .runtimeVendor(jvmInfo.getVendor()) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfo.java index ab0733a8a48..7426dc8b989 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfo.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/JvmInfo.java @@ -1,16 +1,24 @@ package datadog.trace.civisibility.config; +import datadog.trace.api.Config; +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags; import datadog.trace.civisibility.ipc.Serializer; import java.nio.ByteBuffer; import java.util.Objects; public class JvmInfo { - public static final JvmInfo CURRENT_JVM = - new JvmInfo( - System.getProperty("java.runtime.name"), - System.getProperty("java.version"), - System.getProperty("java.vendor")); + public static final JvmInfo CURRENT_JVM; + + static { + Config config = Config.get(); + CiVisibilityWellKnownTags wellKnownTags = config.getCiVisibilityWellKnownTags(); + CURRENT_JVM = + new JvmInfo( + wellKnownTags.getRuntimeName().toString(), + wellKnownTags.getRuntimeVersion().toString(), + wellKnownTags.getRuntimeVendor().toString()); + } private final String name; private final String version; diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java index 9287c17ddbd..d1ba5c9ee56 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java @@ -5,7 +5,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; -import datadog.trace.civisibility.config.JvmInfo; +import datadog.trace.util.Strings; import java.util.Map; public class TestDecoratorImpl implements TestDecorator { @@ -13,41 +13,26 @@ public class TestDecoratorImpl implements TestDecorator { private static final UTF8BytesString CIAPP_TEST_ORIGIN = UTF8BytesString.create("ciapp-test"); private final String component; + private final String sessionName; private final Map ciTags; - public TestDecoratorImpl(String component, Map ciTags) { + public TestDecoratorImpl( + String component, String sessionName, String testCommand, Map ciTags) { this.component = component; this.ciTags = ciTags; + if (Strings.isNotBlank(sessionName)) { + this.sessionName = sessionName; + } else { + String ciJobName = ciTags.get(Tags.CI_JOB_NAME); + this.sessionName = + Strings.isNotBlank(ciJobName) ? ciJobName + "-" + testCommand : testCommand; + } } protected String testType() { return TEST_TYPE; } - protected String runtimeName() { - return JvmInfo.CURRENT_JVM.getName(); - } - - protected String runtimeVendor() { - return JvmInfo.CURRENT_JVM.getVendor(); - } - - protected String runtimeVersion() { - return JvmInfo.CURRENT_JVM.getVersion(); - } - - protected String osArch() { - return System.getProperty("os.arch"); - } - - protected String osPlatform() { - return System.getProperty("os.name"); - } - - protected String osVersion() { - return System.getProperty("os.version"); - } - protected UTF8BytesString origin() { return CIAPP_TEST_ORIGIN; } @@ -59,24 +44,11 @@ public CharSequence component() { @Override public AgentSpan afterStart(final AgentSpan span) { - /* - * IMPORTANT: JVM and OS tags should match properties - * set in datadog.trace.civisibility.config.ExecutionSettingsFactory - * - * Moreover, logic that populates these tags cannot be changed, - * as they are used to establish correspondence between - * executions of the same test case - */ - span.setTag(Tags.TEST_TYPE, testType()); span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP); - span.setTag(Tags.RUNTIME_NAME, runtimeName()); - span.setTag(Tags.RUNTIME_VENDOR, runtimeVendor()); - span.setTag(Tags.RUNTIME_VERSION, runtimeVersion()); - span.setTag(Tags.OS_ARCHITECTURE, osArch()); - span.setTag(Tags.OS_PLATFORM, osPlatform()); - span.setTag(Tags.OS_VERSION, osVersion()); span.setTag(DDTags.ORIGIN_KEY, CIAPP_TEST_ORIGIN); + span.setTag(Tags.TEST_TYPE, testType()); span.setTag(Tags.COMPONENT, component()); + span.setTag(Tags.TEST_SESSION_NAME, sessionName); for (final Map.Entry ciTag : ciTags.entrySet()) { span.setTag(ciTag.getKey(), ciTag.getValue()); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java index c5d93bd3218..d3c93486bda 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java @@ -98,6 +98,7 @@ public BuildSystemModuleImpl( new BuildModuleSettings( getPropertiesPropagatedToChildProcess( moduleName, + startCommand, classpath, jacocoAgent, signalServerAddress, @@ -109,6 +110,7 @@ public BuildSystemModuleImpl( private Map getPropertiesPropagatedToChildProcess( String moduleName, + String startCommand, @Nullable Collection classpath, @Nullable JavaAgent jacocoAgent, InetSocketAddress signalServerAddress, @@ -172,6 +174,9 @@ private Map getPropertiesPropagatedToChildProcess( propagatedSystemProperties.put( Strings.propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_MODULE_NAME), moduleName); + propagatedSystemProperties.put( + Strings.propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_TEST_COMMAND), + startCommand); propagatedSystemProperties.put( Strings.propertyNameToSystemPropertyName( diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/decorator/TestDecoratorImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/decorator/TestDecoratorImplTest.groovy index 48a15b6bde0..c4e531d099c 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/decorator/TestDecoratorImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/decorator/TestDecoratorImplTest.groovy @@ -12,21 +12,16 @@ class TestDecoratorImplTest extends Specification { def "test afterStart"() { setup: - def decorator = newDecorator() + def decorator = new TestDecoratorImpl("test-component", "session-name", "test-command", ["ci-tag-1": "value", "ci-tag-2": "another value"]) when: decorator.afterStart(span) then: + 1 * span.setTag(Tags.TEST_SESSION_NAME, "session-name") 1 * span.setTag(Tags.COMPONENT, "test-component") 1 * span.setTag(Tags.TEST_TYPE, decorator.testType()) 1 * span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP) - 1 * span.setTag(Tags.RUNTIME_NAME, decorator.runtimeName()) - 1 * span.setTag(Tags.RUNTIME_VENDOR, decorator.runtimeVendor()) - 1 * span.setTag(Tags.RUNTIME_VERSION, decorator.runtimeVersion()) - 1 * span.setTag(Tags.OS_ARCHITECTURE, decorator.osArch()) - 1 * span.setTag(Tags.OS_PLATFORM, decorator.osPlatform()) - 1 * span.setTag(Tags.OS_VERSION, decorator.osVersion()) 1 * span.setTag(DDTags.ORIGIN_KEY, decorator.origin()) 1 * span.setTag("ci-tag-1", "value") 1 * span.setTag("ci-tag-2", "another value") @@ -40,7 +35,20 @@ class TestDecoratorImplTest extends Specification { serviceName << ["test-service", "other-service", null] } - static newDecorator() { - new TestDecoratorImpl("test-component", ["ci-tag-1": "value", "ci-tag-2": "another value"]) + def "test session name: #sessionName, #ciJobName, #testCommand"() { + setup: + def decorator = new TestDecoratorImpl("test-component", sessionName, testCommand, [(Tags.CI_JOB_NAME): ciJobName]) + + when: + decorator.afterStart(span) + + then: + 1 * span.setTag(Tags.TEST_SESSION_NAME, expectedSessionName) + + where: + sessionName | ciJobName | testCommand | expectedSessionName + "session-name" | "ci-job-name" | "test-command" | "session-name" + null | "ci-job-name" | "test-command" | "ci-job-name-test-command" + null | null | "test-command" | "test-command" } } diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy index 3c904edddff..900f6fc347a 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy @@ -135,7 +135,7 @@ class TestImplTest extends DDSpecification { def testFramework = TestFrameworkInstrumentation.OTHER def config = Config.get() def metricCollector = Stub(CiVisibilityMetricCollectorImpl) - def testDecorator = new TestDecoratorImpl("component", [:]) + def testDecorator = new TestDecoratorImpl("component", "session-name", "test-command", [:]) def methodLinesResolver = { it -> MethodLinesResolver.MethodLines.EMPTY } def codeowners = NoCodeowners.INSTANCE new TestImpl( 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 ef3b407076a..ad469688968 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 @@ -129,7 +129,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { TestFrameworkSession.Factory testFrameworkSessionFactory = (String projectName, String component, Long startTime) -> { def config = Config.get() def ciTags = [(DUMMY_CI_TAG): DUMMY_CI_TAG_VALUE] - TestDecorator testDecorator = new TestDecoratorImpl(component, ciTags) + TestDecorator testDecorator = new TestDecoratorImpl(component, "session-name", "test-command", ciTags) return new HeadlessTestSession( projectName, startTime, @@ -150,7 +150,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { BuildSystemSession.Factory buildSystemSessionFactory = (String projectName, Path projectRoot, String startCommand, String component, Long startTime) -> { def config = Config.get() def ciTags = [(DUMMY_CI_TAG): DUMMY_CI_TAG_VALUE] - TestDecorator testDecorator = new TestDecoratorImpl(component, ciTags) + TestDecorator testDecorator = new TestDecoratorImpl(component, "session-name", "test-command", ciTags) ModuleSignalRouter moduleSignalRouter = new ModuleSignalRouter() SignalServer signalServer = new SignalServer() RepoIndexBuilder repoIndexBuilder = Stub(RepoIndexBuilder) @@ -269,7 +269,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { } def getEventsAsJson(List> traces) { - return getSpansAsJson(new CiTestCycleMapperV1(Config.get().getWellKnownTags(), false), traces) + return getSpansAsJson(new CiTestCycleMapperV1(Config.get().getCiVisibilityWellKnownTags(), false), traces) } def getCoveragesAsJson(List> traces) { diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy index 305959aca4d..8a303c2efe8 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy @@ -36,6 +36,7 @@ abstract class CiVisibilityTestUtils { path("content.meta.['error.message']"), path("content.meta.library_version"), path("content.meta.runtime-id"), + path("content.meta.['_dd.tracer_host']"), // Different events might or might not have the same start or duration. // Regardless, the values of these fields should be treated as different path("content.start", false), diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/coverages.ftl index 1267ffdffd1..19e827054b9 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/coverages.ftl @@ -5,4 +5,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature" } ] -} ] +} ] \ No newline at end of file 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 6727f918605..17354193afd 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -96,21 +87,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -132,20 +119,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl index a58037fc3df..e43c911d67d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl @@ -54,4 +54,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature" } ] -} ] +} ] \ No newline at end of file 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 aeff80a9c3f..1f73aad5590 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,23 +49,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -101,23 +92,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -149,23 +136,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -197,23 +180,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -244,23 +223,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -292,23 +267,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -340,23 +311,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -387,23 +354,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -429,24 +392,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, - "test.status" : "pass", - "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", + "language" : "jvm", "test.early_flake.abort_reason" : "faulty", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" @@ -467,21 +426,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "test.early_flake.abort_reason" : "faulty", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl index a58037fc3df..e43c911d67d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl @@ -54,4 +54,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature" } ] -} ] +} ] \ No newline at end of file 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 65846337986..106cc8b54e5 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,23 +49,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -101,23 +92,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -149,23 +136,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -197,23 +180,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -244,23 +223,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -292,23 +267,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -340,23 +311,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions #3", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -387,23 +354,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions #4", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -429,24 +392,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, - "test.status" : "pass", - "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", + "language" : "jvm", "test.early_flake.abort_reason" : "faulty", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" @@ -467,21 +426,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "test.early_flake.abort_reason" : "faulty", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/coverages.ftl index 2ba77bb7bf7..fde01167260 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/coverages.ftl @@ -12,4 +12,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_slow.feature" } ] -} ] +} ] \ No newline at end of file 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 c7ed5758773..ccb09ffe378 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,23 +49,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -101,23 +92,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -145,21 +132,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -181,20 +164,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/coverages.ftl index 0d51f5c95fc..062c92b0eb5 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/coverages.ftl @@ -19,4 +19,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature" } ] -} ] +} ] \ No newline at end of file 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 0692bd23c1e..317ebda31d9 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,23 +49,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -101,23 +92,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -149,23 +136,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -193,21 +176,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -229,20 +208,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } 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 dc6b236148d..f66bd41fb34 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/empty_scenario_name.feature:EMPTY_NAME", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "EMPTY_NAME", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/empty_scenario_name.feature:EMPTY_NAME", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -96,20 +87,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -131,21 +118,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } } -} ] +} ] \ No newline at end of file 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 10017a2067b..13bdd5df928 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/empty_scenario_name.feature:EMPTY_NAME", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "LINE:7", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/empty_scenario_name.feature:EMPTY_NAME", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -96,20 +87,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -131,21 +118,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } } -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/coverages.ftl index c8bda9fe50b..1c786471a4a 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/coverages.ftl @@ -5,4 +5,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature" } ] -} ] +} ] \ No newline at end of file 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 16286d541e7..b659b27ae7e 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,22 +49,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -99,20 +90,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -134,19 +121,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/coverages.ftl index fe51488c706..8878e547a79 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/coverages.ftl @@ -1 +1 @@ -[] +[ ] \ No newline at end of file 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 d65e5bf6bec..331dc36369d 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -55,23 +50,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -99,28 +90,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "cucumber" + "test.framework" : "cucumber", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -140,21 +127,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/coverages.ftl index 17de3ff0e17..7702f382943 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/coverages.ftl @@ -5,4 +5,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature" } ] -} ] +} ] \ No newline at end of file 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 a93dd110549..431e0ce2b7c 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -55,24 +50,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -99,27 +90,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "cucumber" + "test.framework" : "cucumber", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -139,20 +126,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/coverages.ftl index add4e40c918..f2f40a32231 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/coverages.ftl @@ -5,4 +5,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_unskippable.feature" } ] -} ] +} ] \ No newline at end of file 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 c4362328f27..5905973dc54 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -55,24 +50,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -99,27 +90,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "cucumber" + "test.framework" : "cucumber", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -139,20 +126,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/coverages.ftl index 3e5b82015d3..ca67218ad4b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/coverages.ftl @@ -12,4 +12,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature" } ] -} ] +} ] \ No newline at end of file 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 8ee370203eb..8e77f81332f 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -94,20 +85,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -134,22 +120,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -179,20 +161,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -214,19 +192,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/coverages.ftl index 3e5b82015d3..ca67218ad4b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/coverages.ftl @@ -12,4 +12,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature" } ] -} ] +} ] \ No newline at end of file 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 8d943397024..631a72e9127 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic #1", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic #1", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -94,20 +85,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic #2", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -134,22 +120,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic #2", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -179,20 +161,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -214,19 +192,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } 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 ed546a40451..7e60539d91d 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/name_with_brackets.feature:This (Name) Has Bracket Characters", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Addition (Has) Brackets Too", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/name_with_brackets.feature:This (Name) Has Bracket Characters", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -96,20 +87,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -131,21 +118,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } } -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/coverages.ftl index 96294358925..a260b7be2a7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/coverages.ftl @@ -33,4 +33,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature" } ] -} ] +} ] \ No newline at end of file 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 4106c7add4e..f3075c4b06f 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,22 +49,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -103,22 +94,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -153,22 +140,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -203,22 +186,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -253,22 +232,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -299,20 +274,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -334,19 +305,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/coverages.ftl index 43883a48a6b..85b59227c8f 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/coverages.ftl @@ -54,4 +54,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature" } ] -} ] +} ] \ No newline at end of file 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 603e6d5784f..0ca617a55a3 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -100,26 +91,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -146,22 +133,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -195,22 +178,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -245,22 +224,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -295,22 +270,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -345,22 +316,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -395,26 +362,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -437,20 +400,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -472,19 +431,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/coverages.ftl index 54d3e0ba293..3bfd9b3a2b8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/coverages.ftl @@ -26,4 +26,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature" } ] -} ] +} ] \ No newline at end of file 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 8a6b64163b7..5d9fe142f48 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -100,26 +91,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -146,22 +133,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions #3", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -195,26 +178,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions #4", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -237,20 +216,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -272,19 +247,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl index 9417e56f18c..983217eee38 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl @@ -26,4 +26,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature" } ] -} ] +} ] \ No newline at end of file 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 5bc9a93d495..baa2d30346d 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -100,26 +91,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -146,26 +133,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -192,26 +175,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -234,20 +213,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -269,19 +244,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/coverages.ftl index 9417e56f18c..983217eee38 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/coverages.ftl @@ -26,4 +26,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature" } ] -} ] +} ] \ No newline at end of file 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 709c7ba53e8..63ac889ce43 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -100,26 +91,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -146,26 +133,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions #3", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -192,26 +175,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions #4", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -234,20 +213,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -269,19 +244,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/coverages.ftl index 1267ffdffd1..19e827054b9 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/coverages.ftl @@ -5,4 +5,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature" } ] -} ] +} ] \ No newline at end of file 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 70f8ce4b475..c1be83f3aad 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 @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-4", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -96,20 +87,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -131,19 +118,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } 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 44b7e428f2a..e28d41adf3c 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 @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "munit-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "munit-junit-4", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -127,24 +113,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 01f7634e623..24d41c01d0b 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 @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "munit-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "munit-junit-4", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedMUnitSlow", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -127,24 +113,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMUnitSlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -175,24 +157,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMUnitSlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", 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 c9ee9c70348..0ed2a028a51 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 @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "munit-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "munit-junit-4", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -127,25 +113,21 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -176,25 +158,21 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -226,25 +204,21 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", 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 c403a154af1..544ab290edf 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "munit-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "munit-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAssumptionMUnit", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -125,23 +111,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestFailedAssumptionMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 8f339fb7acc..b634cd68d81 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "munit-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "munit-junit-4", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAssumptionMUnit", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -125,24 +111,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestFailedAssumptionMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "this test always assumes the wrong thing", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 ed38a89091e..06ba5254c19 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "munit-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "munit-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedThenSucceedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -125,24 +111,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -176,24 +158,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -228,24 +206,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", 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 c070aa5739c..0c62e4823cf 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "munit-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "munit-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -125,24 +111,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestFailedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 f7522b0b959..86eebb48e6e 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "munit-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "munit-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -125,24 +111,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestFailedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -176,24 +158,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestFailedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -228,24 +206,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestFailedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -280,24 +254,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestFailedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -332,24 +302,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestFailedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", 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 441713b5892..fc8a15afc5e 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "munit-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "munit-junit-4", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedSuiteMUnit", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -125,24 +111,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestSkippedSuiteMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"Ignore\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -173,24 +155,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.subtract", "span.kind" : "test", "test.suite" : "org.example.TestSkippedSuiteMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"Ignore\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 d92c09b893e..0cababcc8ad 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "munit-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "munit-junit-4", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -125,24 +111,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestSkippedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"Ignore\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 1a161917297..6a7ef2ba779 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "munit-junit-4", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "munit-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "munit" } @@ -125,24 +111,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "munit-junit-4", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Calculator.add", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMUnit", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"myTag\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 1a152dc291f..748735d7f94 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,22 +75,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "skip", "test.skip_reason" : "got: , expected: is ", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedSuiteSetUpAssumption", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -128,25 +114,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteSetUpAssumption", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "got: , expected: is ", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 ce13d957db6..2d75b83b555 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestAssumptionAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,25 +113,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_fail_assumption()V", "test.module" : "junit-4.10", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_fail_assumption", "span.kind" : "test", "test.suite" : "org.example.TestAssumptionAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "got: , expected: is ", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -178,24 +160,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestAssumptionAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 0b18926abb6..f67d3b6cc90 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestAssumption", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,25 +113,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_fail_assumption()V", "test.module" : "junit-4.10", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_fail_assumption", "span.kind" : "test", "test.suite" : "org.example.TestAssumption", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "got: , expected: is ", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 0b18926abb6..f67d3b6cc90 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestAssumption", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,25 +113,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_fail_assumption()V", "test.module" : "junit-4.10", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_fail_assumption", "span.kind" : "test", "test.suite" : "org.example.TestAssumption", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "got: , expected: is ", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 f133032e7df..a9cc645315c 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,22 +75,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", "test.traits" : "{\"category\":[\"org.example.Slow\",\"org.example.Flaky\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedWithCategories", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -128,25 +114,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedWithCategories", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"org.example.Slow\",\"org.example.Flaky\",\"org.example.End2End\",\"org.example.Browser\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 a791c1c59f5..4cd2762d615 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,22 +75,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "skip", "test.skip_reason" : "Ignore reason in class", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -128,25 +114,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_class_another_skipped()V", "test.module" : "junit-4.10", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_class_another_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in class", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -179,25 +161,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_class_skipped()V", "test.module" : "junit-4.10", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_class_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in class", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 2a562202cbc..7bd42236953 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 @@ -15,24 +15,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, - "test.status" : "fail", - "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", + "language" : "jvm", "test.early_flake.abort_reason" : "faulty", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" @@ -53,21 +49,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "test.early_flake.abort_reason" : "faulty", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -88,21 +79,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -131,25 +117,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -182,25 +164,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -234,25 +212,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -286,25 +260,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -339,25 +309,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -393,25 +359,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -447,25 +409,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 6f3da7d5954..1f1dae26233 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 @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -129,24 +115,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[str1]\"}}", @@ -180,24 +162,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[\\\"str2\\\"]\"}}", 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 275135c8f20..ad0435820ab 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 @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -129,24 +115,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 645355ffb24..57964f120e8 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 @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "fail", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -129,25 +115,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -180,25 +162,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -232,25 +210,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -284,24 +258,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -336,24 +306,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 6f9cd4e2b40..bf5db0cd9dd 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 @@ -16,21 +16,18 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test.early_flake.abort_reason" : "faulty", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +49,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", + "test.early_flake.abort_reason" : "faulty", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -86,21 +79,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -129,25 +117,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[str1]\"}}", @@ -181,25 +165,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -234,25 +214,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -287,25 +263,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[\\\"str2\\\"]\"}}", @@ -339,25 +311,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -392,25 +360,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", 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 cf8b1794723..e355285e5a5 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 @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSlow", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -129,25 +115,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -180,25 +162,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", 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 159dbcff397..445b5c82b2c 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 @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -129,25 +115,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -180,25 +162,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -232,25 +210,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", 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 bd1aabb6c16..d3bbf0b37a2 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 @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedVerySlow", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -129,25 +115,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedVerySlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 0d6168f30cc..ad7e45a92d1 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 e39db029b68..08229c37e33 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedExpectedException", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedExpectedException", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 312d09ed72e..ef4cd759e58 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_then_succeed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_then_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -180,24 +162,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_then_succeed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_then_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -234,24 +212,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_then_succeed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_then_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -288,24 +262,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_then_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_then_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", 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 e0894bae288..cc34aa777a2 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 698b9432866..948207c1ace 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestInheritance", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestInheritance", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 9723c1f9aaa..381a555df2d 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 @@ -16,28 +16,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit4" + "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -57,21 +53,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4", "test.itr.tests_skipping.enabled" : "true" @@ -93,21 +84,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -137,25 +123,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed()V", "test.module" : "junit-4.10", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[str1]\"}}", @@ -191,24 +173,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[\\\"str2\\\"]\"}}", 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 5173bd058b8..54c0bca6c59 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 @@ -16,28 +16,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit4" + "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -57,21 +53,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4", "test.itr.tests_skipping.enabled" : "true" @@ -93,21 +84,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -137,25 +123,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-4.10", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -190,25 +172,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-4.10", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -243,24 +221,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 2e4218eb95e..2401be19264 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 @@ -16,27 +16,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit4" + "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -56,20 +52,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4", "test.itr.tests_skipping.enabled" : "true" @@ -91,21 +82,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -135,26 +121,22 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"org.example.TestSucceedUnskippable$datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 b2fdf9f1c1f..08c91bc56bb 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 @@ -16,27 +16,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit4" + "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -56,20 +52,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4", "test.itr.tests_skipping.enabled" : "true" @@ -91,22 +82,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", "test.traits" : "{\"category\":[\"org.example.TestSucceedUnskippableSuite$datadog_itr_unskippable\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedUnskippableSuite", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -136,27 +122,23 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedUnskippableSuite", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"org.example.TestSucceedUnskippableSuite$datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 09acf5bf4bd..aa84286c0c9 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 @@ -16,27 +16,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit4" + "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -56,20 +52,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4", "test.itr.tests_skipping.enabled" : "true" @@ -91,21 +82,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -135,27 +121,23 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"org.example.TestSucceedUnskippable$datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 b0ab74bb809..7694c8969aa 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedLegacy", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedLegacy", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 5ef70fcfe97..959d7b54586 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -169,21 +151,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -212,25 +189,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "junit-4.10", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -263,24 +236,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 7961c8dafce..81c835efd87 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterizedJUnitParams", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(III)V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized(1, 2, 3) ", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedJUnitParams", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test_parameterized(1, 2, 3) [0]\"}}", @@ -178,24 +160,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(III)V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized(2, 2, 4) ", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedJUnitParams", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test_parameterized(2, 2, 4) [1]\"}}", 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 b1d77dd382f..48ebe8fd1a8 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[str1]\"}}", @@ -178,24 +160,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[\\\"str2\\\"]\"}}", 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 4a8128b9f50..6cd9236e215 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -179,24 +161,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -232,24 +210,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -285,24 +259,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -338,24 +308,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", 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 1524b48539b..4b6ad560633 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test_failed_parameterized[0 0 42]\"}}", @@ -181,24 +163,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -236,24 +214,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -291,24 +265,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -346,24 +316,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -401,24 +367,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test_failed_parameterized[21 21 42]\"}}", 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 fcdd5b9811c..3bc851381b5 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,25 +113,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "junit-4.10", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 fcdd5b9811c..3bc851381b5 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,25 +113,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "junit-4.10", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 6918f2bdc99..fd963854adf 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedKotlin", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "single document (without provider) deserialized from json()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "single document (without provider) deserialized from json", "span.kind" : "test", "test.suite" : "org.example.TestSucceedKotlin", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 67ad111c72c..3114d730968 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedParameterizedKotlin", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "single document (without provider) deserialized from json()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "single document (without provider) deserialized from json", "span.kind" : "test", "test.suite" : "org.example.TestSucceedParameterizedKotlin", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"single document (without provider) deserialized from json[str1]\"}}", @@ -178,24 +160,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "single document (without provider) deserialized from json()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "single document (without provider) deserialized from json", "span.kind" : "test", "test.suite" : "org.example.TestSucceedParameterizedKotlin", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"single document (without provider) deserialized from json[str2]\"}}", 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 dd517b2da37..d97db627987 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 336cd55ef44..047d8e1ea5c 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -177,24 +159,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -229,24 +207,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 84706704ee6..89ae2981c8a 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,25 +113,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "junit-4.10", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -178,24 +160,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 f179c77e7d7..e8b0afa6895 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -177,24 +159,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-4.10", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -229,24 +207,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -271,21 +245,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -314,24 +283,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 570f337ffa2..9c6840f83a9 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSuite$FirstTest", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "testAddition()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "testAddition", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSuite$FirstTest", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -169,21 +151,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSuite$SecondTest", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -212,24 +189,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "testSubtraction()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "testSubtraction", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSuite$SecondTest", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", 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 721d2b7a58d..e86af3ff941 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,16 +75,12 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "error.type" : "java.lang.RuntimeException", @@ -101,7 +88,6 @@ "error.message" : ${content_meta_error_message}, "test.suite" : "org.example.TestFailedSuiteSetup", "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } 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 ad03057a207..d947354a795 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 @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-4.10", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -84,16 +75,12 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-4.10", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "error.type" : "java.lang.RuntimeException", @@ -101,7 +88,6 @@ "error.message" : ${content_meta_error_message}, "test.suite" : "org.example.TestFailedSuiteTearDown", "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit4" } @@ -130,24 +116,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteTearDown", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -180,24 +162,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-4.10", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteTearDown", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/coverages.ftl index 1267ffdffd1..19e827054b9 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/coverages.ftl @@ -5,4 +5,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/events.ftl index bffe5bc8aef..5cd615b823c 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -96,21 +87,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -132,20 +119,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl index ddc58e7b07e..2bc0a5a1dd8 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl @@ -54,4 +54,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl index 87fdd516747..eb02a1c80a1 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,23 +49,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Double digits.Example #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -101,23 +92,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Double digits.Example #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -148,23 +135,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -195,23 +178,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -243,23 +222,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -291,23 +266,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -338,23 +309,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -386,23 +353,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -429,24 +392,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, - "test.status" : "pass", - "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", + "language" : "jvm", "test.early_flake.abort_reason" : "faulty", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" @@ -467,21 +426,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "test.early_flake.abort_reason" : "faulty", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl index ddc58e7b07e..2bc0a5a1dd8 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl @@ -54,4 +54,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl index 95123443409..65789c9afc8 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,23 +49,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Double digits.Example #2.1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -101,23 +92,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Double digits.Example #2.2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -148,23 +135,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1.1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -195,23 +178,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1.1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -243,23 +222,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1.1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -291,23 +266,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1.2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -338,23 +309,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1.2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -386,23 +353,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1.2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -429,24 +392,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, - "test.status" : "pass", - "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", + "language" : "jvm", "test.early_flake.abort_reason" : "faulty", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" @@ -467,21 +426,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "test.early_flake.abort_reason" : "faulty", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/coverages.ftl index 2ba77bb7bf7..fde01167260 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/coverages.ftl @@ -12,4 +12,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_slow.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl index 68a6de747e7..e67693c79d3 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,23 +49,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -101,23 +92,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -145,21 +132,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -181,20 +164,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/coverages.ftl index 0d51f5c95fc..062c92b0eb5 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/coverages.ftl @@ -19,4 +19,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/events.ftl index 214286d0b9d..7e4378c1e15 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,23 +49,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -101,23 +92,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -149,23 +136,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -193,21 +176,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -229,20 +208,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-5.4.0/coverages.ftl index f1add816e1d..b6955e3f32d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-5.4.0/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-5.4.0/coverages.ftl @@ -40,4 +40,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-5.4.0/events.ftl index ecacce73d40..91ddf0bbe4a 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-5.4.0/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,22 +49,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -103,22 +94,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -153,22 +140,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -203,22 +186,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -253,22 +232,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -303,22 +278,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -348,20 +319,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -383,19 +350,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-latest/coverages.ftl index f1add816e1d..b6955e3f32d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-latest/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-latest/coverages.ftl @@ -40,4 +40,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-latest/events.ftl index c76d078caad..eb9a17a99f7 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-scenario-outline-latest/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,22 +49,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1.1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -103,24 +94,21 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1.1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "test.is_retry" : "true", "component" : "junit", "error.type" : "java.lang.AssertionError", "_dd.profiling.ctx" : "test", @@ -152,24 +140,21 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1.1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "test.is_retry" : "true", "component" : "junit", "error.type" : "java.lang.AssertionError", "_dd.profiling.ctx" : "test", @@ -201,24 +186,21 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1.1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "test.is_retry" : "true", "component" : "junit", "error.type" : "java.lang.AssertionError", "_dd.profiling.ctx" : "test", @@ -250,24 +232,21 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1.1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "test.is_retry" : "true", "component" : "junit", "error.type" : "java.lang.AssertionError", "_dd.profiling.ctx" : "test", @@ -299,22 +278,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1.2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -344,20 +319,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -379,19 +350,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/coverages.ftl index b3d4e1706c3..1cec935d759 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/coverages.ftl @@ -19,4 +19,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl index 82686a6373e..da8c04d9dd1 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,22 +49,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -102,22 +93,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -151,22 +138,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -194,20 +177,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -229,19 +208,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/coverages.ftl index c8bda9fe50b..1c786471a4a 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/coverages.ftl @@ -5,4 +5,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/events.ftl index 62e0874e103..0252827df4d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,22 +49,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -99,20 +90,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -134,19 +121,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl index 0eaf287a9b8..13ed261486a 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -55,23 +50,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -99,28 +90,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "cucumber" + "test.framework" : "cucumber", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -140,21 +127,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl index 17de3ff0e17..7702f382943 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl @@ -5,4 +5,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl index 4db4d41b46b..0b36346961e 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -55,24 +50,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -99,27 +90,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "cucumber" + "test.framework" : "cucumber", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -139,20 +126,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl index add4e40c918..f2f40a32231 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl @@ -5,4 +5,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_unskippable.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl index d14f2358618..91bf17fdade 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -55,24 +50,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -99,27 +90,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "cucumber" + "test.framework" : "cucumber", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -139,20 +126,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl index 159b4459d71..986589d97a3 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl @@ -12,4 +12,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_skipped.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl index 542347e949f..07e22db80f4 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -94,20 +85,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -134,23 +120,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}", "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -181,26 +163,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Subtraction", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -223,20 +201,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -258,19 +232,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/coverages.ftl index 96294358925..a260b7be2a7 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/coverages.ftl @@ -33,4 +33,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl index 86478502e14..be7bf7ecbdf 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,22 +49,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -103,22 +94,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -153,22 +140,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -203,22 +186,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -253,22 +232,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -299,20 +274,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -334,19 +305,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl index f5da6c611b0..3de7c42944f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl @@ -26,4 +26,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl index 5e8f3480395..7eed7abdd4f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions.Double digits.Example #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -100,26 +91,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions.Double digits.Example #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -146,26 +133,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions.Single digits.Example #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -192,26 +175,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions.Single digits.Example #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -234,20 +213,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -269,19 +244,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/coverages.ftl index 956897f7795..3de7c42944f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/coverages.ftl @@ -1,29 +1,29 @@ [ { + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id}, + "span_id" : ${content_span_id_3}, "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature" - } ], - "span_id" : ${content_span_id_3}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id} + } ] }, { + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id}, + "span_id" : ${content_span_id_4}, "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature" - } ], - "span_id" : ${content_span_id_4}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id} + } ] }, { + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id}, + "span_id" : ${content_span_id}, "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature" - } ], - "span_id" : ${content_span_id}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id} + } ] }, { + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id}, + "span_id" : ${content_span_id_2}, "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_with_examples.feature" - } ], - "span_id" : ${content_span_id_2}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id} -} ] + } ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl index ab8628cc4c5..55abf7d9b3f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl @@ -1,289 +1,259 @@ [ { + "type" : "test_suite_end", + "version" : 1, "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", + "start" : ${content_start}, "duration" : ${content_duration}, "error" : 0, + "metrics" : { }, "meta" : { - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", + "test.type" : "test", + "test.module" : "cucumber-junit-5", + "test.status" : "pass", + "test_session.name" : "session-name", "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, + "component" : "junit", "span.kind" : "test_suite_end", - "test.framework" : "cucumber", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "cucumber-junit-5", - "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "test.type" : "test" - }, - "metrics" : { }, - "name" : "junit.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}, - "test_module_id" : ${content_test_module_id}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id} - }, - "type" : "test_suite_end", - "version" : 1 + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "cucumber" + } + } }, { + "type" : "test", + "version" : 2, "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.1", + "start" : ${content_start_2}, "duration" : ${content_duration_2}, "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, "meta" : { - "_dd.profiling.ctx" : "test", - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.module" : "cucumber-junit-5", + "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime-id" : ${content_meta_runtime_id}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, - "span.kind" : "test", - "test.framework" : "cucumber", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "cucumber-junit-5", + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions.Double digits.Example #2.1", - "test.status" : "pass", + "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "test.traits" : "{\"category\":[\"foo\"]}", - "test.type" : "test" - }, - "metrics" : { - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id} - }, - "name" : "junit.test", + "runtime-id" : ${content_meta_runtime_id}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "cucumber" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_2}, "parent_id" : ${content_parent_id}, - "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.1", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "span_id" : ${content_span_id}, - "start" : ${content_start_2}, - "test_module_id" : ${content_test_module_id}, "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, - "trace_id" : ${content_trace_id} - }, - "type" : "test", - "version" : 2 -}, { - "content" : { + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.2", + "start" : ${content_start_3}, "duration" : ${content_duration_3}, "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, "meta" : { - "_dd.profiling.ctx" : "test", - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.module" : "cucumber-junit-5", + "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime-id" : ${content_meta_runtime_id}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, - "span.kind" : "test", - "test.framework" : "cucumber", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "cucumber-junit-5", + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions.Double digits.Example #2.2", - "test.status" : "pass", + "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "test.traits" : "{\"category\":[\"foo\"]}", - "test.type" : "test" - }, - "metrics" : { - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id} - }, - "name" : "junit.test", + "runtime-id" : ${content_meta_runtime_id}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "cucumber" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_3}, + "span_id" : ${content_span_id_3}, "parent_id" : ${content_parent_id}, - "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.2", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "span_id" : ${content_span_id_2}, - "start" : ${content_start_3}, - "test_module_id" : ${content_test_module_id}, "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, - "trace_id" : ${content_trace_id_2} - }, - "type" : "test", - "version" : 2 -}, { - "content" : { + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", + "start" : ${content_start_4}, "duration" : ${content_duration_4}, "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, "meta" : { - "_dd.profiling.ctx" : "test", - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.module" : "cucumber-junit-5", + "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime-id" : ${content_meta_runtime_id}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, - "span.kind" : "test", - "test.framework" : "cucumber", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "cucumber-junit-5", + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions.Single digits.Example #1.1", - "test.status" : "pass", + "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "test.traits" : "{\"category\":[\"foo\"]}", - "test.type" : "test" - }, - "metrics" : { - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id} - }, - "name" : "junit.test", + "runtime-id" : ${content_meta_runtime_id}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "cucumber" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_4}, + "span_id" : ${content_span_id_4}, "parent_id" : ${content_parent_id}, - "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "span_id" : ${content_span_id_3}, - "start" : ${content_start_4}, - "test_module_id" : ${content_test_module_id}, "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, - "trace_id" : ${content_trace_id_3} - }, - "type" : "test", - "version" : 2 -}, { - "content" : { + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.2", + "start" : ${content_start_5}, "duration" : ${content_duration_5}, "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, "meta" : { - "_dd.profiling.ctx" : "test", - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.module" : "cucumber-junit-5", + "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime-id" : ${content_meta_runtime_id}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, - "span.kind" : "test", - "test.framework" : "cucumber", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "cucumber-junit-5", + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Many additions.Single digits.Example #1.2", - "test.status" : "pass", + "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", - "test.traits" : "{\"category\":[\"foo\"]}", - "test.type" : "test" - }, - "metrics" : { - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id} - }, - "name" : "junit.test", - "parent_id" : ${content_parent_id}, - "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.2", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "span_id" : ${content_span_id_4}, - "start" : ${content_start_5}, - "test_module_id" : ${content_test_module_id}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id}, - "trace_id" : ${content_trace_id_4} - }, - "type" : "test", - "version" : 2 + "runtime-id" : ${content_meta_runtime_id}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "cucumber" + } + } }, { + "type" : "test_session_end", + "version" : 1, "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "cucumber-junit-5", + "start" : ${content_start_6}, "duration" : ${content_duration_6}, "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, "meta" : { - "_dd.profiling.ctx" : "test", - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime-id" : ${content_meta_runtime_id}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", - "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "pass", - "test.type" : "test" - }, - "metrics" : { - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id} - }, - "name" : "junit.test_session", - "resource" : "cucumber-junit-5", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "start" : ${content_start_6}, - "test_session_id" : ${content_test_session_id} - }, - "type" : "test_session_end", - "version" : 1 + "test.framework" : "cucumber" + } + } }, { + "type" : "test_module_end", + "version" : 1, "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "cucumber-junit-5", + "start" : ${content_start_7}, "duration" : ${content_duration_7}, "error" : 0, + "metrics" : { }, "meta" : { - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", + "test.type" : "test", + "test.module" : "cucumber-junit-5", + "test.status" : "pass", + "test_session.name" : "session-name", "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, + "component" : "junit", "span.kind" : "test_module_end", - "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "cucumber-junit-5", - "test.status" : "pass", - "test.type" : "test" - }, - "metrics" : { }, - "name" : "junit.test_module", - "resource" : "cucumber-junit-5", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "start" : ${content_start_7}, - "test_module_id" : ${content_test_module_id}, - "test_session_id" : ${content_test_session_id} - }, - "type" : "test_module_end", - "version" : 1 + "test.framework" : "cucumber" + } + } } ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl index f84bc5c362d..7088cd6bb46 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,23 +49,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}", "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -101,23 +92,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Subtraction", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}", "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -144,20 +131,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -179,19 +162,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl index 98e9ad66b93..b8ae981fb3d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,23 +49,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Double digits.Example #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}", "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -101,23 +92,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Double digits.Example #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}", "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -148,23 +135,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #1", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}", "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -195,23 +178,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Many additions.Single digits.Example #2", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}", "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -238,20 +217,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -273,19 +248,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl index 60fe0a8ffdc..8c3e1ccad96 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl @@ -1,293 +1,263 @@ [ { + "type" : "test_suite_end", + "version" : 1, "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", + "start" : ${content_start}, "duration" : ${content_duration}, "error" : 0, + "metrics" : { }, "meta" : { - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", + "test.type" : "test", + "test.module" : "cucumber-junit-5", + "test.status" : "skip", + "test_session.name" : "session-name", "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, + "component" : "junit", "span.kind" : "test_suite_end", - "test.framework" : "cucumber", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "cucumber-junit-5", - "test.status" : "skip", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", - "test.type" : "test" - }, - "metrics" : { }, - "name" : "junit.test_suite", - "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "start" : ${content_start}, - "test_module_id" : ${content_test_module_id}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id} - }, - "type" : "test_suite_end", - "version" : 1 + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "cucumber" + } + } }, { + "type" : "test", + "version" : 2, "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.1", + "start" : ${content_start_2}, "duration" : ${content_duration_2}, "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, "meta" : { - "_dd.profiling.ctx" : "test", - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.module" : "cucumber-junit-5", + "test.status" : "skip", "language" : "jvm", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime-id" : ${content_meta_runtime_id}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, - "span.kind" : "test", - "test.framework" : "cucumber", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "cucumber-junit-5", "test.name" : "Many additions.Double digits.Example #2.1", - "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", - "test.status" : "skip", + "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}", - "test.type" : "test" - }, - "metrics" : { - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id} - }, - "name" : "junit.test", + "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "cucumber" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_2}, "parent_id" : ${content_parent_id}, - "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.1", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "span_id" : ${content_span_id}, - "start" : ${content_start_2}, - "test_module_id" : ${content_test_module_id}, "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, - "trace_id" : ${content_trace_id} - }, - "type" : "test", - "version" : 2 -}, { - "content" : { + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.2", + "start" : ${content_start_3}, "duration" : ${content_duration_3}, "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, "meta" : { - "_dd.profiling.ctx" : "test", - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.module" : "cucumber-junit-5", + "test.status" : "skip", "language" : "jvm", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime-id" : ${content_meta_runtime_id}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, - "span.kind" : "test", - "test.framework" : "cucumber", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "cucumber-junit-5", "test.name" : "Many additions.Double digits.Example #2.2", - "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", - "test.status" : "skip", + "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}", - "test.type" : "test" - }, - "metrics" : { - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id} - }, - "name" : "junit.test", + "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "cucumber" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_3}, + "span_id" : ${content_span_id_3}, "parent_id" : ${content_parent_id}, - "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.2", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "span_id" : ${content_span_id_2}, - "start" : ${content_start_3}, - "test_module_id" : ${content_test_module_id}, "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, - "trace_id" : ${content_trace_id_2} - }, - "type" : "test", - "version" : 2 -}, { - "content" : { + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", + "start" : ${content_start_4}, "duration" : ${content_duration_4}, "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, "meta" : { - "_dd.profiling.ctx" : "test", - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.module" : "cucumber-junit-5", + "test.status" : "skip", "language" : "jvm", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime-id" : ${content_meta_runtime_id}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, - "span.kind" : "test", - "test.framework" : "cucumber", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "cucumber-junit-5", "test.name" : "Many additions.Single digits.Example #1.1", - "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", - "test.status" : "skip", + "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}", - "test.type" : "test" - }, - "metrics" : { - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id} - }, - "name" : "junit.test", + "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "cucumber" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_4}, + "span_id" : ${content_span_id_4}, "parent_id" : ${content_parent_id}, - "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "span_id" : ${content_span_id_3}, - "start" : ${content_start_4}, - "test_module_id" : ${content_test_module_id}, "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, - "trace_id" : ${content_trace_id_3} - }, - "type" : "test", - "version" : 2 -}, { - "content" : { + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.2", + "start" : ${content_start_5}, "duration" : ${content_duration_5}, "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, "meta" : { - "_dd.profiling.ctx" : "test", - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.module" : "cucumber-junit-5", + "test.status" : "skip", "language" : "jvm", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime-id" : ${content_meta_runtime_id}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, - "span.kind" : "test", - "test.framework" : "cucumber", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "cucumber-junit-5", "test.name" : "Many additions.Single digits.Example #1.2", - "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", - "test.status" : "skip", + "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}", - "test.type" : "test" - }, - "metrics" : { - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id} - }, - "name" : "junit.test", - "parent_id" : ${content_parent_id}, - "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.2", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "span_id" : ${content_span_id_4}, - "start" : ${content_start_5}, - "test_module_id" : ${content_test_module_id}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id}, - "trace_id" : ${content_trace_id_4} - }, - "type" : "test", - "version" : 2 + "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "cucumber" + } + } }, { + "type" : "test_session_end", + "version" : 1, "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "cucumber-junit-5", + "start" : ${content_start_6}, "duration" : ${content_duration_6}, "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, "meta" : { - "_dd.profiling.ctx" : "test", - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime-id" : ${content_meta_runtime_id}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", - "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "skip", - "test.type" : "test" - }, - "metrics" : { - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id} - }, - "name" : "junit.test_session", - "resource" : "cucumber-junit-5", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "start" : ${content_start_6}, - "test_session_id" : ${content_test_session_id} - }, - "type" : "test_session_end", - "version" : 1 + "test.framework" : "cucumber" + } + } }, { + "type" : "test_module_end", + "version" : 1, "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "cucumber-junit-5", + "start" : ${content_start_7}, "duration" : ${content_duration_7}, "error" : 0, + "metrics" : { }, "meta" : { - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", + "test.type" : "test", + "test.module" : "cucumber-junit-5", + "test.status" : "skip", + "test_session.name" : "session-name", "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, - "os.architecture" : ${content_meta_os_architecture}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, - "runtime.version" : ${content_meta_runtime_version}, + "component" : "junit", "span.kind" : "test_module_end", - "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "cucumber-junit-5", - "test.status" : "skip", - "test.type" : "test" - }, - "metrics" : { }, - "name" : "junit.test_module", - "resource" : "cucumber-junit-5", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "start" : ${content_start_7}, - "test_module_id" : ${content_test_module_id}, - "test_session_id" : ${content_test_session_id} - }, - "type" : "test_module_end", - "version" : 1 + "test.framework" : "cucumber" + } + } } ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/coverages.ftl index cb2f993f810..521e7d56d55 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/coverages.ftl @@ -5,4 +5,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic_skipped.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl index 34ff71895bb..3979419cc61 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,23 +49,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\",\"Disabled\"]}", "test.skip_reason" : "'cucumber.filter.tags=not ( @Disabled )' did not match this scenario", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -101,26 +92,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Subtraction", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -143,20 +130,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -178,19 +161,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/coverages.ftl index 1267ffdffd1..19e827054b9 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/coverages.ftl @@ -5,4 +5,4 @@ "files" : [ { "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl index 21781272cf0..7c2be9321b8 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl @@ -14,20 +14,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -54,26 +49,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "cucumber-junit-5", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", "test.name" : "Addition", "span.kind" : "test", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } @@ -96,20 +87,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "cucumber-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -131,19 +118,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "cucumber-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "cucumber" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/events.ftl index 5db10f7009b..2d3a7d53712 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedAndFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test another success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test another success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -108,25 +99,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test failure()V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test failure", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -162,25 +149,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test failure()V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test failure", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -217,25 +200,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test failure()V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test failure", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -272,25 +251,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -323,25 +298,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -375,25 +346,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -420,24 +387,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, - "test.status" : "fail", - "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", + "language" : "jvm", "test.early_flake.abort_reason" : "faulty", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" @@ -458,21 +421,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "test.early_flake.abort_reason" : "faulty", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/events.ftl index c0fc7d116b2..bbd1a6f3f98 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 1 and 2", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 1 and 2\"}}", @@ -108,24 +99,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 4 and 4\"}}", @@ -153,21 +140,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -189,20 +172,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/events.ftl index d10d40cfd4b..6b843ec91aa 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -101,21 +92,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -137,20 +124,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/events.ftl index 2f9adf619e2..ce3aa9230b1 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 1 and 2", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 1 and 2\"}}", @@ -108,25 +99,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 4 and 4\"}}", @@ -160,25 +147,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -213,25 +196,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -260,21 +239,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -296,20 +271,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/events.ftl index 694aa6440e4..a0e97e2efe9 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 1 and 2", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 1 and 2\"}}", @@ -109,25 +100,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 1 and 2", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -162,25 +149,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 1 and 2", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -215,25 +198,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 4 and 4\"}}", @@ -267,25 +246,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -320,25 +295,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -367,21 +338,18 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test.early_flake.abort_reason" : "faulty", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -403,20 +371,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", + "test.early_flake.abort_reason" : "faulty", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl index 99b9c24cd34..9819d8e9ab1 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSpockSlow", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSpockSlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -108,25 +99,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSpockSlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -154,21 +141,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -190,20 +173,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/events.ftl index 91b7bc2b8a5..dd22f053332 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -108,25 +99,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -160,25 +147,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -206,21 +189,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -242,20 +221,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/events.ftl index 3401355b51f..eefd99100f7 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSpockVerySlow", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSpockVerySlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -102,21 +93,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -138,20 +125,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl index e733d9fc9ea..29647596f4a 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedThenSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test failed then succeed()V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test failed then succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -110,24 +101,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test failed then succeed()V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test failed then succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -164,24 +151,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test failed then succeed()V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test failed then succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -218,24 +201,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test failed then succeed()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test failed then succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -263,20 +242,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -298,19 +273,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed/events.ftl index 05267679013..628abf462eb 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test failed()V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -104,20 +95,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -139,19 +126,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl index a1b382fa3f5..51448849cd8 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterizedSetupSpecSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -58,25 +53,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 1 and 2", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSetupSpecSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 1 and 2\"}}", @@ -112,24 +103,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSetupSpecSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 4 and 4\"}}", @@ -176,28 +163,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "spock" + "test.framework" : "spock", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -217,21 +200,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl index 98d5b008e22..cf27963ec29 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSetupSpecSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -58,24 +53,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test another success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test another success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSetupSpecSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -109,25 +100,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSetupSpecSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -174,28 +161,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "spock" + "test.framework" : "spock", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -215,24 +198,19 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock", "test.itr.tests_skipping.enabled" : "true" } } -} ] +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl index 34256605a29..413f8f3ba79 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -58,25 +53,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 1 and 2", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 1 and 2\"}}", @@ -112,24 +103,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 4 and 4\"}}", @@ -157,28 +144,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "spock" + "test.framework" : "spock", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -198,21 +181,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/events.ftl index 41783104f48..155ba118eb6 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/events.ftl @@ -14,22 +14,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "skip", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSetupSpecSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -59,25 +54,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test another success()V", "test.module" : "spock-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test another success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSetupSpecSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -112,25 +103,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSetupSpecSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -158,28 +145,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "spock" + "test.framework" : "spock", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -199,21 +182,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl index efe4c5e05a6..3772182123b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl @@ -14,21 +14,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -58,25 +54,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -104,28 +96,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "spock" + "test.framework" : "spock", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -145,21 +133,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl index 73416143258..d30f5e541e3 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSpockUnskippableSuite", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -58,27 +53,23 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSpockUnskippableSuite", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -105,27 +96,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "spock" + "test.framework" : "spock", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -145,20 +132,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl index b33c7605b2c..9742963e120 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSpockUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -58,27 +53,23 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSpockUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -105,27 +96,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "spock" + "test.framework" : "spock", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -145,20 +132,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl index 06da90eede2..5776784340f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedThenSucceedParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 1 and 2", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceedParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 1 and 2\"}}", @@ -111,24 +102,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 1 and 2", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceedParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -166,24 +153,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 1 and 2", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceedParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -218,24 +201,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceedParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 4 and 4\"}}", @@ -266,20 +245,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -301,19 +276,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/events.ftl index 3d632db6af5..99b26508352 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test failed()V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -110,24 +101,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test failed()V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -164,24 +151,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test failed()V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -218,24 +201,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test failed()V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -272,24 +251,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test failed()V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -320,20 +295,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -355,19 +326,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/events.ftl index fd93a0de80e..026da385b07 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 1 and 2", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 1 and 2\"}}", @@ -108,24 +99,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 4 and 4\"}}", @@ -162,24 +149,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -217,24 +200,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -272,24 +251,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -327,24 +302,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -376,20 +347,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -411,19 +378,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl index 9adff3a9401..7b95c695d39 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 1 and 2", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 1 and 2\"}}", @@ -108,24 +99,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test add #a and #b(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test add 4 and 4", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test add 4 and 4\"}}", @@ -153,20 +140,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -188,19 +171,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl index 03d1e1c9a84..7c21ab56a5b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test success()V", "test.module" : "spock-junit-5", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test success", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSpock", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -101,20 +92,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "spock-junit-5", "test.framework_version" : ${content_meta_test_framework_version}, @@ -136,19 +123,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "spock-junit-5", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "spock" } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl index 1179de69a99..0c89ae416f4 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestAssumptionLegacy", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,25 +113,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_fail_assumption_legacy()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_fail_assumption_legacy", "span.kind" : "test", "test.suite" : "org.example.TestAssumptionLegacy", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "assumption is not fulfilled", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/events.ftl index e982f444167..46ff7a13d43 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestAssumption", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,25 +113,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_fail_assumption()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_fail_assumption", "span.kind" : "test", "test.suite" : "org.example.TestAssumption", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Assumption failed: assumption is not true", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-is-not-retried/events.ftl index e982f444167..46ff7a13d43 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-is-not-retried/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-is-not-retried/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestAssumption", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,25 +113,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_fail_assumption()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_fail_assumption", "span.kind" : "test", "test.suite" : "org.example.TestAssumption", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Assumption failed: assumption is not true", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/events.ftl index 26f4e6daa76..b4c9321f96f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,22 +75,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", "test.traits" : "{\"category\":[\"Slow\",\"Flaky\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedWithCategories", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -128,25 +114,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedWithCategories", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"End2end\",\"Browser\",\"Slow\",\"Flaky\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/events.ftl index 572b176d34e..6afb3153a80 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/events.ftl @@ -15,24 +15,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, - "test.status" : "fail", - "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", + "language" : "jvm", "test.early_flake.abort_reason" : "faulty", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" @@ -53,21 +49,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "test.early_flake.abort_reason" : "faulty", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -88,21 +79,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -131,25 +117,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -182,25 +164,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -234,25 +212,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -286,25 +260,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -340,25 +310,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -395,25 +361,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -450,25 +412,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test/events.ftl index aff9f234996..c3ca82c5836 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test/events.ftl @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -129,24 +115,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(IIILjava/lang/String;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"[1] 0, 0, 0, some:\\\"parameter\\\"\"}}", @@ -180,24 +162,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(IIILjava/lang/String;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"[2] 1, 1, 2, some:\\\"parameter\\\"\"}}", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-test/events.ftl index 1145df0fa81..49a04ae4b5d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-test/events.ftl @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -129,24 +115,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/events.ftl index c6ec343fb76..bd035c3a921 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/events.ftl @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "fail", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -129,25 +115,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -180,25 +162,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -232,25 +210,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -284,24 +258,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -337,24 +307,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test/events.ftl index f804b47a75d..6b528881c65 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test/events.ftl @@ -16,21 +16,18 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test.early_flake.abort_reason" : "faulty", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +49,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", + "test.early_flake.abort_reason" : "faulty", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -86,21 +79,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -129,25 +117,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(IIILjava/lang/String;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"[1] 0, 0, 0, some:\\\"parameter\\\"\"}}", @@ -181,25 +165,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(IIILjava/lang/String;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -234,25 +214,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(IIILjava/lang/String;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -287,25 +263,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(IIILjava/lang/String;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"[2] 1, 1, 2, some:\\\"parameter\\\"\"}}", @@ -339,25 +311,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(IIILjava/lang/String;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -392,25 +360,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(IIILjava/lang/String;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-slow-test/events.ftl index b1f4c07a0c8..4c84b557522 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-slow-test/events.ftl @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSlow", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -129,25 +115,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -180,25 +162,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-test/events.ftl index 39ee5584480..f7a5ebdc36b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-test/events.ftl @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -129,25 +115,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -180,25 +162,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -232,25 +210,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-very-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-very-slow-test/events.ftl index 019cf117161..100aa5cad2f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-very-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-very-slow-test/events.ftl @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -52,20 +48,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -86,21 +77,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedVerySlow", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -129,25 +115,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedVerySlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/events.ftl index 27c46f47844..6a3e960f463 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/events.ftl index 713cc474023..fba0c108f4d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedExpectedException", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedExpectedException", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/events.ftl index 39ec5760eb7..a836ae52801 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFactory", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_factory()Ljava/lang/Iterable;", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_factory", "span.kind" : "test", "test.suite" : "org.example.TestFactory", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -177,24 +159,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_factory()Ljava/lang/Iterable;", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_factory", "span.kind" : "test", "test.suite" : "org.example.TestFactory", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl index 77eefbf50c2..9c593b4e5bb 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_then_succeed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_then_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -180,24 +162,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_then_succeed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_then_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -234,24 +212,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_then_succeed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_then_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -288,24 +262,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_then_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_then_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/events.ftl index 24900bb73ca..0a03341d0b6 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/events.ftl index 03da41ea2bd..d96a19b5ba9 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestInheritance", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestInheritance", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl index 2a173ef0ed9..c90b818f7c5 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl @@ -16,28 +16,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" + "test.framework" : "junit5", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -57,21 +53,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5", "test.itr.tests_skipping.enabled" : "true" @@ -93,21 +84,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -137,25 +123,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(IIILjava/lang/String;)V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"[1] 0, 0, 0, some:\\\"parameter\\\"\"}}", @@ -191,24 +173,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(IIILjava/lang/String;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"[2] 1, 1, 2, some:\\\"parameter\\\"\"}}", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/events.ftl index 021f33b2184..8eabee694ea 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/events.ftl @@ -16,28 +16,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" + "test.framework" : "junit5", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -57,21 +53,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5", "test.itr.tests_skipping.enabled" : "true" @@ -93,21 +84,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -137,25 +123,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -190,25 +172,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -243,24 +221,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl index 9acd445899a..4ad4ccae34c 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl @@ -16,27 +16,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" + "test.framework" : "junit5", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -56,20 +52,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5", "test.itr.tests_skipping.enabled" : "true" @@ -91,21 +82,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -135,26 +121,22 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl index d395a8efb95..fb88a520290 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -16,27 +16,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" + "test.framework" : "junit5", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -56,20 +52,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5", "test.itr.tests_skipping.enabled" : "true" @@ -91,22 +82,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedUnskippableSuite", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -136,27 +122,23 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedUnskippableSuite", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl index f12a4c77692..9b276396a27 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl @@ -16,27 +16,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" + "test.framework" : "junit5", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -56,20 +52,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5", "test.itr.tests_skipping.enabled" : "true" @@ -91,21 +82,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -135,27 +121,23 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/events.ftl index e419e3d64d9..d437b12e604 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(IIILjava/lang/String;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"[1] 0, 0, 0, some:\\\"parameter\\\"\"}}", @@ -178,24 +160,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized(IIILjava/lang/String;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"[2] 1, 1, 2, some:\\\"parameter\\\"\"}}", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/events.ftl index 4f267700ed7..002ab2a3588 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestRepeated", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_repeated()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_repeated", "span.kind" : "test", "test.suite" : "org.example.TestRepeated", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -177,24 +159,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_repeated()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_repeated", "span.kind" : "test", "test.suite" : "org.example.TestRepeated", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-factory/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-factory/events.ftl index 751eeb49920..d7e227b16dc 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-factory/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-factory/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedFactory", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_factory()Ljava/lang/Iterable;", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_factory", "span.kind" : "test", "test.suite" : "org.example.TestFailedFactory", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -177,24 +159,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_factory()Ljava/lang/Iterable;", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_factory", "span.kind" : "test", "test.suite" : "org.example.TestFailedFactory", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -230,24 +208,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_factory()Ljava/lang/Iterable;", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_factory", "span.kind" : "test", "test.suite" : "org.example.TestFailedFactory", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -284,24 +258,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_factory()Ljava/lang/Iterable;", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_factory", "span.kind" : "test", "test.suite" : "org.example.TestFailedFactory", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -338,24 +308,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_factory()Ljava/lang/Iterable;", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_factory", "span.kind" : "test", "test.suite" : "org.example.TestFailedFactory", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -392,24 +358,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_factory()Ljava/lang/Iterable;", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_factory", "span.kind" : "test", "test.suite" : "org.example.TestFailedFactory", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/events.ftl index 4f94a3ef357..703fdcdaed5 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -180,24 +162,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -234,24 +212,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -288,24 +262,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -342,24 +312,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl index 370babd4de5..20273c515dd 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized(III)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"[1] 0, 0, 42\"}}", @@ -181,24 +163,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized(III)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -236,24 +214,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized(III)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -291,24 +265,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized(III)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -346,24 +316,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized(III)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -401,24 +367,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized(III)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"[2] 1, 1, 42\"}}", @@ -455,24 +417,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized(III)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -510,24 +468,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized(III)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -565,24 +519,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized(III)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -620,24 +570,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_parameterized(III)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_parameterized", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/events.ftl index 93869e79e0d..32a9ec11edf 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedTemplate", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_template(Lorg/example/TestFailedTemplate$SampleTestCase;)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_template", "span.kind" : "test", "test.suite" : "org.example.TestFailedTemplate", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test_template_failed\"}}", @@ -181,24 +163,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_template(Lorg/example/TestFailedTemplate$SampleTestCase;)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_template", "span.kind" : "test", "test.suite" : "org.example.TestFailedTemplate", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -236,24 +214,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_template(Lorg/example/TestFailedTemplate$SampleTestCase;)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_template", "span.kind" : "test", "test.suite" : "org.example.TestFailedTemplate", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -291,24 +265,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_template(Lorg/example/TestFailedTemplate$SampleTestCase;)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_template", "span.kind" : "test", "test.suite" : "org.example.TestFailedTemplate", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -346,24 +316,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_template(Lorg/example/TestFailedTemplate$SampleTestCase;)V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_template", "span.kind" : "test", "test.suite" : "org.example.TestFailedTemplate", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -401,24 +367,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_template(Lorg/example/TestFailedTemplate$SampleTestCase;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_template", "span.kind" : "test", "test.suite" : "org.example.TestFailedTemplate", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test_template_succeed\"}}", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/events.ftl index 2a0b0b7b236..4c9cbf6286b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,22 +75,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "skip", "test.skip_reason" : "Ignore reason in class", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -128,25 +114,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_case_skipped()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_case_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in class", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -179,25 +161,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_factory_skipped()Ljava/lang/Iterable;", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_factory_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in class", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -230,25 +208,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_parameterized_skipped(IIILjava/lang/String;)V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_parameterized_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in class", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test_parameterized_skipped(int, int, int, String)\"}}", @@ -282,25 +256,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_repeated_skipped()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_repeated_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in class", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-is-not-retried/events.ftl index 53e6b3ce616..7ea49d8f679 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-is-not-retried/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-is-not-retried/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,25 +113,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl index 69eb9ca8645..29ccd92c1c7 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,22 +75,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "skip", "test.skip_reason" : "Ignore reason in class", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedNested", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -120,22 +106,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "skip", "test.skip_reason" : "Ignore reason in class", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -164,25 +145,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_nested()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_nested", "span.kind" : "test", "test.suite" : "org.example.TestSkippedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in class", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -215,25 +192,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSkippedNested", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in class", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/events.ftl index 53e6b3ce616..7ea49d8f679 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,25 +113,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl index e64bd174afd..fc7169ae29d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -177,24 +159,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -230,24 +208,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -272,21 +246,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -315,24 +284,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl index 834fd977045..273f82c7680 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -177,24 +159,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "junit-5.3", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -230,24 +208,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl index 0cb9a59f3a7..3849c6f08c1 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,25 +113,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -178,24 +160,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl index b1df212ae2e..005b37ed711 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -169,21 +151,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -212,25 +189,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -263,24 +236,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl index cbdb22378e7..2853c5707ca 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedNested", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -119,21 +105,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -162,24 +143,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_nested()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_nested", "span.kind" : "test", "test.suite" : "org.example.TestSucceedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -212,24 +189,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedNested", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/events.ftl index 222cf1923af..0aca616460f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl index 4dc30e6349c..7ceb2e2c775 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestAssumptionAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,25 +113,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_fail_assumption()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_fail_assumption", "span.kind" : "test", "test.suite" : "org.example.TestAssumptionAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Assumption failed: assumption is not true", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -178,24 +160,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestAssumptionAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl index 29a2b9d773c..675fda39f0f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,22 +75,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "skip", "test.skip_reason" : "Assumption failed: assumption is not true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSuiteSetUpAssumption", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -128,25 +114,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSuiteSetUpAssumption", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Assumption failed: assumption is not true", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl index dcb52039be1..757953ca1b5 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,16 +75,12 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "error.type" : "java.lang.RuntimeException", @@ -101,7 +88,6 @@ "error.message" : ${content_meta_error_message}, "test.suite" : "org.example.TestFailedSuiteTearDown", "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -130,24 +116,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteTearDown", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -180,24 +162,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteTearDown", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl index dcb52039be1..757953ca1b5 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,16 +75,12 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "error.type" : "java.lang.RuntimeException", @@ -101,7 +88,6 @@ "error.message" : ${content_meta_error_message}, "test.suite" : "org.example.TestFailedSuiteTearDown", "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -130,24 +116,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteTearDown", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -180,24 +162,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteTearDown", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/events.ftl index 1c383209d36..91712f32ac9 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/events.ftl @@ -16,20 +16,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "junit-5.3", "test.framework_version" : ${content_meta_test_framework_version}, @@ -51,19 +47,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -84,21 +75,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "junit-5.3", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestTemplate", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -127,24 +113,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_template(Lorg/example/TestTemplate$SampleTestCase;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_template", "span.kind" : "test", "test.suite" : "org.example.TestTemplate", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test_template_1\"}}", @@ -178,24 +160,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_template(Lorg/example/TestTemplate$SampleTestCase;)V", "test.module" : "junit-5.3", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_template", "span.kind" : "test", "test.suite" : "org.example.TestTemplate", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"metadata\":{\"test_name\":\"test_template_2\"}}", diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-built-in-retry/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-built-in-retry/events.ftl index a0996895453..75ee91dd3cd 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-built-in-retry/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-built-in-retry/events.ftl @@ -86,15 +86,11 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "error.type" : "com.intuit.karate.KarateException", @@ -102,7 +98,6 @@ "error.message" : ${content_meta_error_message}, "test.suite" : "[org/example/test_failed] test failed", "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -123,20 +118,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_failed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -163,25 +153,21 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "karate", + "_dd.profiling.ctx" : "test", "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_failed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "karate", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -208,21 +194,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "second scenario", "span.kind" : "test", "test.suite" : "[org/example/test_failed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "karate", @@ -256,21 +238,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "second scenario", "span.kind" : "test", "test.suite" : "[org/example/test_failed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "karate", @@ -300,20 +278,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -335,19 +309,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-faulty-session-threshold/events.ftl index 64b9719e227..005eb1c5ee9 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-faulty-session-threshold/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-faulty-session-threshold/events.ftl @@ -518,20 +518,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_parameterized_more_cases] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -558,22 +553,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized_more_cases] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", @@ -605,22 +596,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized_more_cases] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -653,22 +640,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized_more_cases] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -701,22 +684,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized_more_cases] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", @@ -748,22 +727,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized_more_cases] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -796,22 +771,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized_more_cases] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -844,22 +815,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized_more_cases] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"param\":\"\\'c\\'\",\"value\":\"cc\"}", @@ -886,24 +853,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, - "test.status" : "pass", - "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", + "language" : "jvm", "test.early_flake.abort_reason" : "faulty", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" @@ -924,21 +887,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "test.early_flake.abort_reason" : "faulty", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-known-parameterized-test/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-known-parameterized-test/events.ftl index f0d2153fbce..70811f5f9af 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-known-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-known-parameterized-test/events.ftl @@ -158,20 +158,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -198,26 +193,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "test.name" : "first scenario as an outline", - "span.kind" : "test", - "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", + "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", + "test.name" : "first scenario as an outline", + "span.kind" : "test", + "test.suite" : "[org/example/test_parameterized] test parameterized", + "runtime-id" : ${content_meta_runtime_id}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -244,26 +235,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "test.name" : "first scenario as an outline", - "span.kind" : "test", - "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", + "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", + "test.name" : "first scenario as an outline", + "span.kind" : "test", + "test.suite" : "[org/example/test_parameterized] test parameterized", + "runtime-id" : ${content_meta_runtime_id}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -286,21 +273,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -322,20 +305,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-known-test/events.ftl index 4436570ed30..b974891721a 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-known-test/events.ftl @@ -38,21 +38,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_succeed_one_case] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -79,26 +74,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test.traits" : "{\"category\":[\"bar\",\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "karate", + "_dd.profiling.ctx" : "test", "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_succeed_one_case] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"bar\",\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "karate", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -121,21 +112,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -157,20 +144,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-parameterized-test/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-parameterized-test/events.ftl index 5c31fc0d748..5adac82097a 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-parameterized-test/events.ftl @@ -446,20 +446,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -486,22 +481,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", @@ -533,22 +524,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -581,22 +568,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -629,22 +612,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", @@ -676,22 +655,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -724,22 +699,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -768,21 +739,18 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test.early_flake.abort_reason" : "faulty", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -804,20 +772,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", + "test.early_flake.abort_reason" : "faulty", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-slow-test/events.ftl index 0cbc11f2d2d..8fc05a4dece 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-slow-test/events.ftl @@ -62,21 +62,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_succeed_slow] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -103,23 +98,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_succeed_slow] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"bar\",\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "karate", @@ -150,23 +141,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_succeed_slow] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"bar\",\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -194,21 +181,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -230,20 +213,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-test/events.ftl index 45ba6e8fa31..9a86cf58429 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-test/events.ftl @@ -86,21 +86,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_succeed_one_case] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -127,23 +122,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_succeed_one_case] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"bar\",\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "karate", @@ -174,23 +165,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_succeed_one_case] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"bar\",\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -222,23 +209,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_succeed_one_case] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"bar\",\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -266,21 +249,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -302,20 +281,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-failed-then-succeed/events.ftl index 793832c5be8..b6cd700554f 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-failed-then-succeed/events.ftl @@ -86,20 +86,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_failed_then_succeed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -126,21 +121,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "flaky scenario", "span.kind" : "test", "test.suite" : "[org/example/test_failed_then_succeed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "karate", @@ -174,21 +165,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "flaky scenario", "span.kind" : "test", "test.suite" : "[org/example/test_failed_then_succeed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -223,26 +210,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "test.name" : "flaky scenario", - "span.kind" : "test", - "test.suite" : "[org/example/test_failed_then_succeed] test failed", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", + "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", + "test.name" : "flaky scenario", + "span.kind" : "test", + "test.suite" : "[org/example/test_failed_then_succeed] test failed", + "runtime-id" : ${content_meta_runtime_id}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -265,20 +248,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -300,19 +279,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-failed/events.ftl index 0c2e7ca42e8..6cb7039646b 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-failed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-failed/events.ftl @@ -62,15 +62,11 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "error.type" : "com.intuit.karate.KarateException", @@ -78,7 +74,6 @@ "error.message" : ${content_meta_error_message}, "test.suite" : "[org/example/test_failed] test failed", "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -105,25 +100,21 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "karate", + "_dd.profiling.ctx" : "test", "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_failed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "karate", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -150,21 +141,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "second scenario", "span.kind" : "test", "test.suite" : "[org/example/test_failed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "karate", @@ -194,20 +181,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -229,19 +212,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/events.ftl index 210dfd3f48a..5664bd058e7 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/events.ftl @@ -86,20 +86,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -114,6 +109,7 @@ "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, + "itr_correlation_id" : "itrCorrelationId", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "karate.test", "resource" : "[org/example/test_parameterized] test parameterized.first scenario as an outline", @@ -126,22 +122,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", @@ -162,6 +154,7 @@ "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, + "itr_correlation_id" : "itrCorrelationId", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "karate.test", "resource" : "[org/example/test_parameterized] test parameterized.first scenario as an outline", @@ -174,21 +167,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", @@ -216,28 +205,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "karate" + "test.framework" : "karate", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -257,21 +242,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping/events.ftl index c3dce6ca5b9..d1d805de333 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping/events.ftl @@ -38,21 +38,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_succeed] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -67,6 +62,7 @@ "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, + "itr_correlation_id" : "itrCorrelationId", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "karate.test", "resource" : "[org/example/test_succeed] test succeed.first scenario", @@ -79,23 +75,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_succeed] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"bar\",\"foo\"]}", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "karate", @@ -115,6 +107,7 @@ "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, + "itr_correlation_id" : "itrCorrelationId", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "karate.test", "resource" : "[org/example/test_succeed] test succeed.second scenario", @@ -127,22 +120,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "second scenario", "span.kind" : "test", "test.suite" : "[org/example/test_succeed] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "karate", @@ -169,28 +158,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "karate" + "test.framework" : "karate", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -210,21 +195,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-unskippable/events.ftl index 04c749a1c8d..b5cfe09cf63 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-unskippable/events.ftl @@ -62,21 +62,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_unskippable] test unskippable", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -91,6 +86,7 @@ "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, + "itr_correlation_id" : "itrCorrelationId", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "karate.test", "resource" : "[org/example/test_unskippable] test unskippable.first scenario", @@ -103,24 +99,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_unskippable] test unskippable", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"bar\",\"datadog_itr_unskippable\",\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "karate", @@ -139,6 +131,7 @@ "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, + "itr_correlation_id" : "itrCorrelationId", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "karate.test", "resource" : "[org/example/test_unskippable] test unskippable.second scenario", @@ -151,22 +144,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "second scenario", "span.kind" : "test", "test.suite" : "[org/example/test_unskippable] test unskippable", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "karate", @@ -193,27 +182,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "karate" + "test.framework" : "karate", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -233,20 +218,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/events.ftl index 265a75069ac..11ae6fb4373 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/events.ftl @@ -158,20 +158,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -198,26 +193,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "test.name" : "first scenario as an outline", - "span.kind" : "test", - "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", + "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", + "test.name" : "first scenario as an outline", + "span.kind" : "test", + "test.suite" : "[org/example/test_parameterized] test parameterized", + "runtime-id" : ${content_meta_runtime_id}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -244,26 +235,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "test.name" : "first scenario as an outline", - "span.kind" : "test", - "test.suite" : "[org/example/test_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", + "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", + "test.name" : "first scenario as an outline", + "span.kind" : "test", + "test.suite" : "[org/example/test_parameterized] test parameterized", + "runtime-id" : ${content_meta_runtime_id}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -286,20 +273,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -321,19 +304,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-failed/events.ftl index 7901f6eb013..a2ec44a945f 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-failed/events.ftl @@ -158,15 +158,11 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "error.type" : "com.intuit.karate.KarateException", @@ -174,7 +170,6 @@ "error.message" : ${content_meta_error_message}, "test.suite" : "[org/example/test_failed] test failed", "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -201,25 +196,21 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "karate", + "_dd.profiling.ctx" : "test", "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_failed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "karate", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -246,21 +237,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "second scenario", "span.kind" : "test", "test.suite" : "[org/example/test_failed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "karate", @@ -294,21 +281,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "second scenario", "span.kind" : "test", "test.suite" : "[org/example/test_failed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -343,21 +326,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "second scenario", "span.kind" : "test", "test.suite" : "[org/example/test_failed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -392,21 +371,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "second scenario", "span.kind" : "test", "test.suite" : "[org/example/test_failed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -441,21 +416,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "second scenario", "span.kind" : "test", "test.suite" : "[org/example/test_failed] test failed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -486,20 +457,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -521,19 +488,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-parameterized/events.ftl index 80ba38d7b75..f134e05256c 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-parameterized/events.ftl @@ -446,15 +446,11 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "error.type" : "com.intuit.karate.KarateException", @@ -462,7 +458,6 @@ "error.message" : ${content_meta_error_message}, "test.suite" : "[org/example/test_failed_parameterized] test parameterized", "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -489,21 +484,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_failed_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aaa\"}", @@ -538,21 +529,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_failed_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -588,21 +575,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_failed_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -638,21 +621,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_failed_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -688,21 +667,17 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario as an outline", "span.kind" : "test", "test.suite" : "[org/example/test_failed_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -738,26 +713,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "test.name" : "first scenario as an outline", - "span.kind" : "test", - "test.suite" : "[org/example/test_failed_parameterized] test parameterized", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", + "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", + "test.name" : "first scenario as an outline", + "span.kind" : "test", + "test.suite" : "[org/example/test_failed_parameterized] test parameterized", + "runtime-id" : ${content_meta_runtime_id}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -780,20 +751,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -815,19 +782,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-skipped-feature/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-skipped-feature/events.ftl index f0f56dbc845..164fbc4aac8 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-skipped-feature/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-skipped-feature/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "skip", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_succeed] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -51,20 +46,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -86,19 +77,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed-parallel/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed-parallel/events.ftl index 0bf7decba6b..8ad2fe279cb 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed-parallel/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed-parallel/events.ftl @@ -62,21 +62,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_succeed] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -103,26 +98,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test.traits" : "{\"category\":[\"bar\",\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "karate", + "_dd.profiling.ctx" : "test", "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_succeed] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"bar\",\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "karate", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -149,26 +140,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "karate", + "_dd.profiling.ctx" : "test", "test.name" : "second scenario", "span.kind" : "test", "test.suite" : "[org/example/test_succeed] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "karate", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -191,20 +178,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -226,19 +209,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed/events.ftl index 0bf7decba6b..8ad2fe279cb 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-succeed/events.ftl @@ -62,21 +62,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_succeed] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -103,26 +98,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test.traits" : "{\"category\":[\"bar\",\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "karate", + "_dd.profiling.ctx" : "test", "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_succeed] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"bar\",\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "karate", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -149,26 +140,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", + "test.traits" : "{\"category\":[\"foo\"]}", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", "library_version" : ${content_meta_library_version}, + "component" : "karate", + "_dd.profiling.ctx" : "test", "test.name" : "second scenario", "span.kind" : "test", "test.suite" : "[org/example/test_succeed] test succeed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "test.traits" : "{\"category\":[\"foo\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "karate", - "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -191,20 +178,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -226,19 +209,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-with-setup/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-with-setup/events.ftl index ae48834c810..9dc9f8d3879 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-with-setup/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-with-setup/events.ftl @@ -62,20 +62,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_suite_end", "test.suite" : "[org/example/test_with_setup] test with setup", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } @@ -102,22 +97,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "first scenario", "span.kind" : "test", "test.suite" : "[org/example/test_with_setup] test with setup", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"withSetup\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"foo\":\"bar\"}", @@ -149,22 +140,18 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "karate", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "second scenario", "span.kind" : "test", "test.suite" : "[org/example/test_with_setup] test with setup", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"withSetupOnce\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"foo\":\"bar\"}", @@ -192,20 +179,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, @@ -227,19 +210,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "karate", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "karate", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "karate" } diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/events.ftl index c2d4db2d50a..7640fe08ebf 100644 --- a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/events.ftl +++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/events.ftl @@ -15,26 +15,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "maven", "error.type" : "org.apache.maven.lifecycle.LifecycleExecutionException", "_dd.profiling.ctx" : "test", "test.toolchain" : ${content_meta_test_toolchain}, + "span.kind" : "test_session_end", "error.message" : ${content_meta_error_message}, "error.stack" : ${content_meta_error_stack}, + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "mvn -B clean test" } } @@ -53,23 +49,18 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "Maven Integration Tests Project maven-surefire-plugin default-test", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "error.type" : "org.apache.maven.lifecycle.LifecycleExecutionException", "span.kind" : "test_module_end", "test.execution" : "maven-surefire-plugin:test:default-test", "error.message" : ${content_meta_error_message}, - "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, + "error.stack" : ${content_meta_error_stack_2}, "test.command" : "mvn -B clean test" } } diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/events.ftl index 9d2a18a9d32..5de81acc87e 100644 --- a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/events.ftl +++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/events.ftl @@ -15,26 +15,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "maven", "error.type" : "org.apache.maven.lifecycle.LifecyclePhaseNotFoundException", "_dd.profiling.ctx" : "test", "test.toolchain" : ${content_meta_test_toolchain}, + "span.kind" : "test_session_end", "error.message" : ${content_meta_error_message}, "error.stack" : ${content_meta_error_stack}, + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "mvn -B unknownPhase" } } diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/events.ftl index d671977a2c4..180c9143df1 100644 --- a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/events.ftl +++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/events.ftl @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "_dd.profiling.ctx" : "test", "test.toolchain" : ${content_meta_test_toolchain}, "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "mvn -B clean test" } @@ -50,20 +46,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "Maven Integration Tests Project maven-surefire-plugin default-test", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "span.kind" : "test_module_end", "test.execution" : "maven-surefire-plugin:test:default-test", - "runtime.version" : ${content_meta_runtime_version}, "test.command" : "mvn -B clean test" } } diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/events.ftl index 96fddd5d768..d0eeff6f50e 100644 --- a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/events.ftl +++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/events.ftl @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "_dd.profiling.ctx" : "test", "test.toolchain" : ${content_meta_test_toolchain}, "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "mvn -B verify" } diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/events.ftl index d671977a2c4..180c9143df1 100644 --- a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/events.ftl +++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/events.ftl @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "_dd.profiling.ctx" : "test", "test.toolchain" : ${content_meta_test_toolchain}, "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "mvn -B clean test" } @@ -50,20 +46,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "Maven Integration Tests Project maven-surefire-plugin default-test", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "span.kind" : "test_module_end", "test.execution" : "maven-surefire-plugin:test:default-test", - "runtime.version" : ${content_meta_runtime_version}, "test.command" : "mvn -B clean test" } } diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/events.ftl index 9d517fc10e8..1c5f0d81577 100644 --- a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/events.ftl +++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/events.ftl @@ -15,26 +15,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "maven", "error.type" : "org.apache.maven.lifecycle.LifecycleExecutionException", "_dd.profiling.ctx" : "test", "test.toolchain" : ${content_meta_test_toolchain}, + "span.kind" : "test_session_end", "error.message" : ${content_meta_error_message}, "error.stack" : ${content_meta_error_stack}, + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "mvn -B clean test" } } @@ -53,20 +49,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "module-a maven-surefire-plugin default-test", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "span.kind" : "test_module_end", "test.execution" : "maven-surefire-plugin:test:default-test", - "runtime.version" : ${content_meta_runtime_version}, "test.command" : "mvn -B clean test" } } @@ -85,23 +76,18 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "module-b maven-surefire-plugin default-test", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "error.type" : "org.apache.maven.lifecycle.LifecycleExecutionException", "span.kind" : "test_module_end", "test.execution" : "maven-surefire-plugin:test:default-test", "error.message" : ${content_meta_error_message}, - "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, + "error.stack" : ${content_meta_error_stack_2}, "test.command" : "mvn -B clean test" } } diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/events.ftl index c15951a251a..c6342d89e37 100644 --- a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/events.ftl +++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/events.ftl @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "_dd.profiling.ctx" : "test", "test.toolchain" : ${content_meta_test_toolchain}, "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "mvn -B -T4 clean test" } @@ -50,20 +46,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "module-a maven-surefire-plugin default-test", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "span.kind" : "test_module_end", "test.execution" : "maven-surefire-plugin:test:default-test", - "runtime.version" : ${content_meta_runtime_version}, "test.command" : "mvn -B -T4 clean test" } } @@ -82,20 +73,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "module-b maven-surefire-plugin default-test", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "span.kind" : "test_module_end", "test.execution" : "maven-surefire-plugin:test:default-test", - "runtime.version" : ${content_meta_runtime_version}, "test.command" : "mvn -B -T4 clean test" } } diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/events.ftl index eb4cdc663a5..499be5055d6 100644 --- a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/events.ftl +++ b/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/events.ftl @@ -16,21 +16,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "_dd.profiling.ctx" : "test", "test.toolchain" : ${content_meta_test_toolchain}, "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "mvn -B verify" } @@ -50,20 +46,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "Maven Integration Tests Project maven-failsafe-plugin default", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "span.kind" : "test_module_end", "test.execution" : "maven-failsafe-plugin:integration-test:default", - "runtime.version" : ${content_meta_runtime_version}, "test.command" : "mvn -B verify" } } @@ -82,20 +73,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "Maven Integration Tests Project maven-surefire-plugin default-test", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "maven", "span.kind" : "test_module_end", "test.execution" : "maven-surefire-plugin:test:default-test", - "runtime.version" : ${content_meta_runtime_version}, "test.command" : "mvn -B verify" } } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-canceled/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-canceled/events.ftl index 62b9b226497..7ee816dfc85 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-canceled/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-canceled/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestIgnoredCanceled", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,24 +50,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestIgnoredCanceled", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "4 did not equal 22", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -99,20 +90,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -134,19 +121,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-faulty-session-threshold/events.ftl index e13a967caf6..abfd913aadf 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-faulty-session-threshold/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-faulty-session-threshold/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedMoreCases", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,24 +50,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMoreCases", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -103,24 +94,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMoreCases", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -152,24 +139,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMoreCases", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -201,24 +184,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.multiply multiplies two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMoreCases", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -249,24 +228,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.subtract subtracts two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMoreCases", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -297,24 +272,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.subtract subtracts two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMoreCases", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -346,24 +317,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.subtract subtracts two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMoreCases", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -390,24 +357,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, - "test.status" : "pass", - "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", + "language" : "jvm", "test.early_flake.abort_reason" : "faulty", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" @@ -428,21 +391,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "test.early_flake.abort_reason" : "faulty", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-known-test/events.ftl index 066844386a8..b8ec832f71b 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-known-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,23 +50,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -98,21 +89,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -134,20 +121,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-new-slow-test/events.ftl index 9a33a2dcbca..d6c00783ee0 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-new-slow-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSlow", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,24 +50,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -103,24 +94,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -148,21 +135,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -184,20 +167,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-new-test/events.ftl index 5fd21e05aa7..a07a6128a52 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-efd-new-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,24 +50,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -103,24 +94,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -152,24 +139,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -197,21 +180,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -233,20 +212,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-suite/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-suite/events.ftl index 3821c55ed5c..5df193c117f 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-suite/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-suite/events.ftl @@ -14,16 +14,12 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "error.type" : "java.lang.RuntimeException", @@ -31,7 +27,6 @@ "error.message" : ${content_meta_error_message}, "test.suite" : "org.example.TestFailedSuite", "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -54,20 +49,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -89,19 +80,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-then-succeed/events.ftl index 01826a6ed64..1d7cda42383 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-then-succeed/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,23 +50,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -105,23 +96,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -156,23 +143,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -200,20 +183,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -235,19 +214,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed/events.ftl index 63ef0d0b52b..c1b63b2a01a 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,23 +50,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -101,20 +92,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -136,19 +123,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-ignored/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-ignored/events.ftl index c79d305435d..ce44f599228 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-ignored/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-ignored/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestIgnored", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,23 +50,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestIgnored", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -98,20 +89,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -133,19 +120,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-itr-skipping/events.ftl index 8716fa5f25c..11f2cc42eee 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-itr-skipping/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -56,24 +51,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -101,28 +92,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "scalatest" + "test.framework" : "scalatest", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -142,21 +129,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-itr-unskippable-not-skipped/events.ftl index 4da638f8be6..d2318855e69 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-itr-unskippable-not-skipped/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-itr-unskippable-not-skipped/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -56,25 +51,21 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test should assert something", "span.kind" : "test", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -101,27 +92,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "scalatest" + "test.framework" : "scalatest", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -141,20 +128,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-itr-unskippable/events.ftl index 9f24185956b..0dcba49ea77 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-itr-unskippable/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -56,26 +51,22 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test should assert something", "span.kind" : "test", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -102,27 +93,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "scalatest" + "test.framework" : "scalatest", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -142,20 +129,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-pending/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-pending/events.ftl index df3cf37b04a..9f4cbae8736 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-pending/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-pending/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestIgnoredPending", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,24 +50,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestIgnoredPending", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "pending", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -99,20 +90,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -134,19 +121,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-failed/events.ftl index 993442a16a6..3e4e848014b 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-failed/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,23 +50,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -105,23 +96,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -156,23 +143,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -207,23 +190,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -258,23 +237,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -305,20 +280,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -340,19 +311,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-parameterized/events.ftl index 5103f344634..6c7e7142694 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-parameterized/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,23 +50,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "addition should correctly add two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -105,23 +96,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "addition should correctly add two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -156,23 +143,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "addition should correctly add two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -207,23 +190,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "addition should correctly add two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -258,23 +237,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "addition should correctly add two numbers", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -305,20 +280,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -340,19 +311,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-succeed-flat-spec/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-succeed-flat-spec/events.ftl index 2ec57f9ad0c..5667682478b 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-succeed-flat-spec/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-succeed-flat-spec/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedFlatSpec", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,23 +50,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "2 + 2 should assert something", "span.kind" : "test", "test.suite" : "org.example.TestSucceedFlatSpec", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -102,23 +93,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "2 + 2 should be equal to 4", "span.kind" : "test", "test.suite" : "org.example.TestSucceedFlatSpec", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -145,20 +132,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -180,19 +163,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-succeed-parameterized/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-succeed-parameterized/events.ftl index 610f30c7566..fff16cd697a 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-succeed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-succeed-parameterized/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,23 +50,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "addition should correctly add two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -98,20 +89,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -133,19 +120,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-succeed/events.ftl index 511e8173d47..499d6d645a5 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-succeed/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } @@ -55,23 +50,19 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.module" : "scalatest", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "Example.add adds two numbers", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "scalatest", @@ -98,20 +89,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, @@ -133,19 +120,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "scalatest", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "scalatest", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "scalatest" } diff --git a/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed/events.ftl index c8f5a9aa8d2..3a69df5c8a8 100644 --- a/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "selenium", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSelenium", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } @@ -57,28 +52,24 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, "test.browser.driver_version" : "3.141.59", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "selenium", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, "test.browser.name" : "htmlunit", - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSelenium", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "browser", "test.browser.driver" : "selenium", "test.is_rum_active" : "true", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "junit", @@ -106,20 +97,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "selenium", "test.framework_version" : ${content_meta_test_framework_version}, @@ -141,19 +128,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "selenium", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "junit5" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-class-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-class-skipped/events.ftl index 510b6d70a2b..d5549918d6f 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-class-skipped/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-class-skipped/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_class_another_skipped()V", "test.module" : "testng-6", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_class_another_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_class_skipped()V", "test.module" : "testng-6", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_class_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -151,20 +138,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -186,19 +169,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-error/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-error/events.ftl index 6e377684862..f817a48c2a2 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-error/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-error/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -104,20 +95,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -139,19 +126,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-factory-data-provider/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-factory-data-provider/events.ftl index 6635a242bed..64c08e1249d 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-factory-data-provider/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-factory-data-provider/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedDataProvider", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "testMethod()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "testMethod", "span.kind" : "test", "test.suite" : "org.example.TestSucceedDataProvider", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -101,20 +92,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -136,19 +123,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-6/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-6/events.ftl index 89419ed6a0e..547d2d42094 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-6/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-6/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -104,20 +95,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -139,19 +126,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-then-succeed-6/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-then-succeed-6/events.ftl index 2924cc851cc..52a0f0d7910 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-then-succeed-6/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-then-succeed-6/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,24 +101,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -164,24 +151,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -209,20 +192,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -244,19 +223,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-with-success-percentage-6/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-with-success-percentage-6/events.ftl index 91555400fef..cbf1d8e0022 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-with-success-percentage-6/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-failed-with-success-percentage-6/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,31 +101,27 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", "error.type" : "java.lang.AssertionError", "_dd.profiling.ctx" : "test", "error.message" : ${content_meta_error_message}, - "error.stack" : ${content_meta_error_stack}, + "error.stack" : ${content_meta_error_stack_2}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -163,24 +150,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -213,24 +196,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -263,24 +242,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -307,20 +282,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -342,19 +313,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-inheritance/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-inheritance/events.ftl index 029ad8406c4..9967c5d7e0b 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-inheritance/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-inheritance/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestInheritance", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestInheritance", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -101,20 +92,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -136,19 +123,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl index 9125d4fc98b..e97aef02a50 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedDataProvider", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -58,25 +53,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "testMethod()V", "test.module" : "testng-6", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "testMethod", "span.kind" : "test", "test.suite" : "org.example.TestSucceedDataProvider", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -104,28 +95,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "testng" + "test.framework" : "testng", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -145,21 +132,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-parameterized/events.ftl index 206da1fb8d4..8721bbda517 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping-parameterized/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -58,25 +53,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-6", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}", @@ -112,24 +103,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}", @@ -157,28 +144,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "testng" + "test.framework" : "testng", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -198,21 +181,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping/events.ftl index 215510fde13..0f5b5f16379 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-skipping/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -58,25 +53,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-6", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -111,25 +102,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-6", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -164,24 +151,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -208,28 +191,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "testng" + "test.framework" : "testng", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -249,21 +228,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable-not-skipped/events.ftl index c64386a39c1..c2617deb72c 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable-not-skipped/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable-not-skipped/events.ftl @@ -14,22 +14,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -59,26 +54,22 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -105,27 +96,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "testng" + "test.framework" : "testng", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -145,20 +132,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable/events.ftl index b0a43e18597..2fba7c386cd 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-itr-unskippable/events.ftl @@ -14,22 +14,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -59,27 +54,23 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -106,27 +97,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "testng" + "test.framework" : "testng", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -146,20 +133,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-multiple-successful-suites/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-multiple-successful-suites/events.ftl index 5bcdeb18b43..15ca494deae 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-multiple-successful-suites/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-multiple-successful-suites/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -99,21 +90,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -142,25 +128,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "testng-6", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -193,24 +175,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -237,20 +215,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -272,19 +246,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-skipped-suites-6/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-skipped-suites-6/events.ftl index 04259f5d061..ca1b24c47b1 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-skipped-suites-6/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-skipped-suites-6/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedNested", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -49,21 +44,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -92,24 +82,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_nested()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_nested", "span.kind" : "test", "test.suite" : "org.example.TestSkippedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -142,24 +128,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSkippedNested", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -186,20 +168,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -221,19 +199,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-successful-suites/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-successful-suites/events.ftl index 64e84615250..980ae0bda3e 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-successful-suites/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-nested-successful-suites/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedNested", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -49,21 +44,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -92,24 +82,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_nested()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_nested", "span.kind" : "test", "test.suite" : "org.example.TestSucceedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -142,24 +128,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedNested", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -186,20 +168,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -221,19 +199,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-modifies-params/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-modifies-params/events.ftl index 1217549c753..be20f5c1df6 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-modifies-params/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-modifies-params/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterizedModifiesParams", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Ljava/util/Set;)V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedModifiesParams", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"I will modify this set\",\"1\":\"[]\"}}", @@ -102,20 +93,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -137,19 +124,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl index f6b5748b5d9..45501f22005 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}", @@ -108,24 +99,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}", @@ -153,20 +140,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -188,19 +171,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized/events.ftl index f6b5748b5d9..45501f22005 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-parameterized/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}", @@ -108,24 +99,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}", @@ -153,20 +140,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -188,19 +171,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-retry-error/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-retry-error/events.ftl index caf4c192364..941bf1205ff 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-retry-error/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-retry-error/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,24 +101,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -164,24 +151,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -218,24 +201,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -272,24 +251,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -320,20 +295,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -355,19 +326,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-retry-failed-6/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-retry-failed-6/events.ftl index 343efe63ad9..17d56f46420 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-retry-failed-6/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-retry-failed-6/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,24 +101,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -164,24 +151,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -218,24 +201,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -272,24 +251,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -320,20 +295,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -355,19 +326,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-retry-parameterized/events.ftl index bc643d4fc97..9282ae36c02 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-retry-parameterized/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}", @@ -108,24 +99,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}", @@ -161,24 +148,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -215,24 +198,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -269,24 +248,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -323,24 +298,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -371,20 +342,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -406,19 +373,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-skipped/events.ftl index f66a67b38d5..b2eeed29782 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-skipped/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-skipped/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "testng-6", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -102,20 +93,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -137,19 +124,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-succeed/events.ftl index 9362b01e8d5..66973104e96 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-succeed/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -101,20 +92,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -136,19 +123,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-failure-6/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-failure-6/events.ftl index 2461be6e78a..e035515af6b 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-failure-6/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-failure-6/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -160,24 +147,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -204,20 +187,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -239,19 +218,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-skipped/events.ftl index 49f2b1fed3f..1e6ed3d730d 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-skipped/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-and-skipped/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "testng-6", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -108,24 +99,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -152,20 +139,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -187,19 +170,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-with-groups/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-with-groups/events.ftl index 11511323139..08067e25a61 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-with-groups/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-success-with-groups/events.ftl @@ -14,22 +14,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", "test.traits" : "{\"category\":[\"classGroup\",\"parentGroup\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedGroups", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -58,25 +53,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedGroups", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"classGroup\",\"testCaseGroup\",\"parentGroup\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -103,20 +94,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -138,19 +125,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-suite-and-failed-suite-6/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-suite-and-failed-suite-6/events.ftl index 3cd6235bd71..40320656afc 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-suite-and-failed-suite-6/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-suite-and-failed-suite-6/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-6", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -160,24 +147,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -202,21 +185,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -245,24 +223,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -289,20 +263,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -324,19 +294,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl index 9f84c51eb8b..9cf90c6cfa3 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedThreeCases", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_a()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_a", "span.kind" : "test", "test.suite" : "org.example.TestSucceedThreeCases", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_b()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_b", "span.kind" : "test", "test.suite" : "org.example.TestSucceedThreeCases", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -151,20 +138,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -186,19 +169,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl index 25f4b0c88ca..b3432073a61 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -157,24 +144,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -201,20 +184,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -236,19 +215,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl index 6dfd3e66558..b777f6d1783 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedMultiple", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMultiple", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_another()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_another", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMultiple", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -151,20 +138,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -186,19 +169,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-parallel/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-parallel/events.ftl index 6dfd3e66558..b777f6d1783 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-parallel/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-successful-test-cases-in-parallel/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedMultiple", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMultiple", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_another()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_another", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMultiple", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -151,20 +138,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -186,19 +169,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-setup-failure/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-setup-failure/events.ftl index d032079e272..c848cd8b32d 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-setup-failure/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-setup-failure/events.ftl @@ -14,16 +14,12 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "error.type" : "java.lang.RuntimeException", @@ -31,7 +27,6 @@ "error.message" : ${content_meta_error_message}, "test.suite" : "org.example.TestFailedSuiteSetup", "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -60,24 +55,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-6", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteSetup", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,24 +101,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteSetup", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -154,20 +141,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -189,19 +172,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-teardown-failure/events.ftl b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-teardown-failure/events.ftl index c8ccd8fa327..78cad291683 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-teardown-failure/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-suite-teardown-failure/events.ftl @@ -14,16 +14,12 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "error.type" : "java.lang.RuntimeException", @@ -31,7 +27,6 @@ "error.message" : ${content_meta_error_message}, "test.suite" : "org.example.TestFailedSuiteTearDown", "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -60,24 +55,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteTearDown", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,24 +101,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-6", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteTearDown", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -154,20 +141,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-6", "test.framework_version" : ${content_meta_test_framework_version}, @@ -189,19 +172,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-6", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-class-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-class-skipped/events.ftl index 4ec7b0c36d0..522f9df7964 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-class-skipped/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-class-skipped/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_class_another_skipped()V", "test.module" : "testng-7", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_class_another_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in class", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -108,25 +99,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_class_skipped()V", "test.module" : "testng-7", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_class_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkippedClass", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in class", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -153,20 +140,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -188,19 +171,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-faulty-session-threshold/events.ftl index 4c121ca7484..83867ec017a 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-faulty-session-threshold/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-faulty-session-threshold/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -108,25 +99,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -160,25 +147,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -212,25 +195,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -266,25 +245,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -321,25 +296,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -376,25 +347,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -420,24 +387,20 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, - "test.status" : "fail", - "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", + "language" : "jvm", "test.early_flake.abort_reason" : "faulty", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" @@ -458,21 +421,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "test.early_flake.abort_reason" : "faulty", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-known-parameterized-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-known-parameterized-test/events.ftl index 51d7fba6e15..c26bcd15871 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-known-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-known-parameterized-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}", @@ -108,24 +99,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}", @@ -153,21 +140,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -189,20 +172,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-known-test/events.ftl index 213f971af6e..c6613ad7cfd 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-known-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -101,21 +92,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -137,20 +124,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-known-tests-and-new-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-known-tests-and-new-test/events.ftl index c22faf86f44..8580f14f878 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-known-tests-and-new-test/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-known-tests-and-new-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -108,25 +99,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -160,25 +147,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -212,24 +195,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -265,24 +244,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -309,21 +284,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -345,20 +316,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-parameterized-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-parameterized-test/events.ftl index cbcf677c038..b9532c8d203 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-parameterized-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}", @@ -109,25 +100,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -162,25 +149,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -215,25 +198,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}", @@ -267,25 +246,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -320,25 +295,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -367,21 +338,18 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test.early_flake.abort_reason" : "faulty", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -403,20 +371,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", + "test.early_flake.abort_reason" : "faulty", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-slow-test/events.ftl index 0c083e595be..54f3e3fe25b 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-slow-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedSlow", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -108,25 +99,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedSlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -154,21 +141,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -190,20 +173,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-test/events.ftl index d696c391d34..6a6b8e4c19c 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -108,25 +99,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -160,25 +147,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -206,21 +189,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -242,20 +221,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-very-slow-test/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-very-slow-test/events.ftl index b842ab45624..84910662b61 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-very-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-efd-new-very-slow-test/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedVerySlow", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", "test.is_new" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedVerySlow", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -102,21 +93,17 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "test.early_flake.enabled" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -138,20 +125,15 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", "test.early_flake.enabled" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-error/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-error/events.ftl index c63552c20e6..4b0bc3745fe 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-error/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-error/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -104,20 +95,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -139,19 +126,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-factory-data-provider/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-factory-data-provider/events.ftl index b5552380ece..044c5896f47 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-factory-data-provider/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-factory-data-provider/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedDataProvider", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "testMethod()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "testMethod", "span.kind" : "test", "test.suite" : "org.example.TestSucceedDataProvider", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -101,20 +92,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -136,19 +123,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-7/events.ftl index 6631f1a7d82..325fdb0456f 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-7/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-7/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -104,20 +95,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -139,19 +126,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-latest/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-latest/events.ftl index 6631f1a7d82..325fdb0456f 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-latest/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-latest/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -104,20 +95,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -139,19 +126,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed-7/events.ftl index 90790c07517..0a190e1e583 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed-7/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed-7/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,24 +101,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -164,24 +151,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -209,20 +192,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -244,19 +223,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed-latest/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed-latest/events.ftl index 90790c07517..0a190e1e583 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed-latest/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed-latest/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,24 +101,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -164,24 +151,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedThenSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -209,20 +192,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -244,19 +223,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-7/events.ftl index 1a3f6cdbd5a..7b1ead91ae8 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-7/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-7/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,31 +101,27 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", "error.type" : "java.lang.AssertionError", "_dd.profiling.ctx" : "test", "error.message" : ${content_meta_error_message}, - "error.stack" : ${content_meta_error_stack}, + "error.stack" : ${content_meta_error_stack_2}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -163,24 +150,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -213,24 +196,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -263,24 +242,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -307,20 +282,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -342,19 +313,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-latest/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-latest/events.ftl index 1a3f6cdbd5a..7b1ead91ae8 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-latest/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-with-success-percentage-latest/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,31 +101,27 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", "error.type" : "java.lang.AssertionError", "_dd.profiling.ctx" : "test", "error.message" : ${content_meta_error_message}, - "error.stack" : ${content_meta_error_stack}, + "error.stack" : ${content_meta_error_stack_2}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -163,24 +150,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -213,24 +196,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -263,24 +242,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed_with_success_percentage()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed_with_success_percentage", "span.kind" : "test", "test.suite" : "org.example.TestFailedWithSuccessPercentage", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -307,20 +282,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -342,19 +313,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-inheritance/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-inheritance/events.ftl index e1f2a6ac2f2..6777c3d1708 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-inheritance/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-inheritance/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestInheritance", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestInheritance", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -101,20 +92,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -136,19 +123,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl index 0c9e0705be5..d50a8a4e842 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-factory-data-provider/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedDataProvider", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -58,25 +53,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "testMethod()V", "test.module" : "testng-7", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "testMethod", "span.kind" : "test", "test.suite" : "org.example.TestSucceedDataProvider", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -104,28 +95,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "testng" + "test.framework" : "testng", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -145,21 +132,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "skip", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-parameterized/events.ftl index c00e8437d43..7b0d7d86c27 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping-parameterized/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -58,25 +53,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}", @@ -112,24 +103,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}", @@ -157,28 +144,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "testng" + "test.framework" : "testng", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -198,21 +181,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping/events.ftl index a1de4c0a8f2..040ae056750 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-skipping/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -58,25 +53,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-7", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -111,25 +102,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -164,24 +151,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -208,28 +191,24 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "testng" + "test.framework" : "testng", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -249,21 +228,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable-not-skipped/events.ftl index d5d00f71aac..ad1309fabd1 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable-not-skipped/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable-not-skipped/events.ftl @@ -14,22 +14,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -59,26 +54,22 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -105,27 +96,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "testng" + "test.framework" : "testng", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -145,20 +132,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable/events.ftl index b2951a53aa3..6e15d34c569 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-itr-unskippable/events.ftl @@ -14,22 +14,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -59,27 +54,23 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", "test.itr.forced_run" : "true", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.itr.unskippable" : "true", "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedUnskippable", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"datadog_itr_unskippable\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -106,27 +97,23 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "testng" + "test.framework" : "testng", + "test.itr.tests_skipping.enabled" : "true" } } }, { @@ -146,20 +133,15 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng", "test.itr.tests_skipping.enabled" : "true" diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-multiple-successful-suites/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-multiple-successful-suites/events.ftl index 8fffe4093ed..fd7d21e5745 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-multiple-successful-suites/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-multiple-successful-suites/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -99,21 +90,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -142,25 +128,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "testng-7", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -193,24 +175,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -237,20 +215,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -272,19 +246,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-7/events.ftl index a7a865ecf23..afe96a59f7d 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-7/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-7/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedNested", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -49,21 +44,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -92,24 +82,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_nested()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_nested", "span.kind" : "test", "test.suite" : "org.example.TestSkippedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -142,25 +128,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSkippedNested", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in class", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -187,20 +169,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -222,19 +200,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-latest/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-latest/events.ftl index a7a865ecf23..afe96a59f7d 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-latest/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-skipped-suites-latest/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedNested", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -49,21 +44,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkippedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -92,24 +82,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_nested()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_nested", "span.kind" : "test", "test.suite" : "org.example.TestSkippedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -142,25 +128,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSkippedNested", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in class", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -187,20 +169,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -222,19 +200,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-successful-suites/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-successful-suites/events.ftl index c6244dad111..a1695e77d9e 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-successful-suites/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-nested-successful-suites/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedNested", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -49,21 +44,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -92,24 +82,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_nested()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_nested", "span.kind" : "test", "test.suite" : "org.example.TestSucceedNested$NestedSuite", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -142,24 +128,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedNested", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -186,20 +168,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -221,19 +199,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-modifies-params/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-modifies-params/events.ftl index 57bde31048b..23d3463177b 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-modifies-params/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-modifies-params/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterizedModifiesParams", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Ljava/util/Set;)V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterizedModifiesParams", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"I will modify this set\",\"1\":\"[]\"}}", @@ -102,20 +93,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -137,19 +124,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl index 87a2176b781..bff972f00e1 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized-test-cases-in-parallel/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}", @@ -108,24 +99,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}", @@ -153,20 +140,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -188,19 +171,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized/events.ftl index 87a2176b781..bff972f00e1 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-parameterized/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}", @@ -108,24 +99,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}", @@ -153,20 +140,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -188,19 +171,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-error/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-error/events.ftl index 5873b8c6579..8d36b13459f 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-error/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-error/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,24 +101,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -164,24 +151,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -218,24 +201,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -272,24 +251,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_error()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_error", "span.kind" : "test", "test.suite" : "org.example.TestError", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -320,20 +295,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -355,19 +326,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-failed-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-failed-7/events.ftl index 47596d4f2d6..c7b50f79d7b 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-failed-7/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-failed-7/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,24 +101,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -164,24 +151,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -218,24 +201,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -272,24 +251,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -320,20 +295,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -355,19 +326,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-failed-latest/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-failed-latest/events.ftl index 47596d4f2d6..c7b50f79d7b 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-failed-latest/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-failed-latest/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,24 +101,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -164,24 +151,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -218,24 +201,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -272,24 +251,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -320,20 +295,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -355,19 +326,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-parameterized/events.ftl index 9017e4e61fb..e9c0f16b393 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-parameterized/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"hello\",\"1\":\"true\"}}", @@ -108,24 +99,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.parameters" : "{\"arguments\":{\"0\":\"\\\"goodbye\\\"\",\"1\":\"false\"}}", @@ -161,24 +148,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -215,24 +198,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -269,24 +248,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -323,24 +298,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "parameterized_test_succeed(Ljava/lang/String;Z)V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "parameterized_test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedParameterized", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", @@ -371,20 +342,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -406,19 +373,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-skipped/events.ftl index 5e4236e60e5..85d3586db95 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-skipped/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-skipped/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "testng-7", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -102,20 +93,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -137,19 +124,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "skip", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-succeed/events.ftl index b0b171a87d9..b75872d4c18 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-succeed/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -101,20 +92,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -136,19 +123,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-7/events.ftl index 6e02746e289..d8d79f7670d 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-7/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-7/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -160,24 +147,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -204,20 +187,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -239,19 +218,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-latest/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-latest/events.ftl index 6e02746e289..d8d79f7670d 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-latest/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-failure-latest/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -160,24 +147,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -204,20 +187,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -239,19 +218,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-skipped/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-skipped/events.ftl index 4076933d535..87c2baf1070 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-skipped/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-and-skipped/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,25 +52,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_skipped()V", "test.module" : "testng-7", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_skipped", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "Ignore reason in test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -108,24 +99,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedAndSkipped", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -152,20 +139,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -187,19 +170,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-with-groups/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-with-groups/events.ftl index 6d80e38fc1a..b2e55d35824 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-with-groups/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-success-with-groups/events.ftl @@ -14,22 +14,17 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", "test.traits" : "{\"category\":[\"classGroup\",\"parentGroup\"]}", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedGroups", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -58,25 +53,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedGroups", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.traits" : "{\"category\":[\"classGroup\",\"testCaseGroup\",\"parentGroup\"]}", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -103,20 +94,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -138,19 +125,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-7/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-7/events.ftl index 95300f45ec5..b9d0f090cff 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-7/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-7/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -160,24 +147,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -202,21 +185,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -245,24 +223,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -289,20 +263,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -324,19 +294,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-latest/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-latest/events.ftl index 95300f45ec5..b9d0f090cff 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-latest/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-suite-and-failed-suite-latest/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_failed()V", "test.module" : "testng-7", "test.status" : "fail", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_failed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -160,24 +147,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedAndSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -202,21 +185,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -245,24 +223,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -289,20 +263,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -324,19 +294,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl index a458f8258a5..41b5015f584 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-not-all-test-methods-included/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedThreeCases", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_a()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_a", "span.kind" : "test", "test.suite" : "org.example.TestSucceedThreeCases", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_b()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_b", "span.kind" : "test", "test.suite" : "org.example.TestSucceedThreeCases", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -151,20 +138,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -186,19 +169,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl index e4bbe58fcad..e22798d044d 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode-same-test-case/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -157,24 +144,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -201,20 +184,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -236,19 +215,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl index 10249d1643b..7c4971c687d 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-TESTS-parallel-mode/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedMultiple", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMultiple", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_another()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_another", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMultiple", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -151,20 +138,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -186,19 +169,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-parallel/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-parallel/events.ftl index 10249d1643b..7c4971c687d 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-parallel/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-successful-test-cases-in-parallel/events.ftl @@ -14,21 +14,16 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_suite_end", "test.suite" : "org.example.TestSucceedMultiple", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -57,24 +52,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMultiple", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -107,24 +98,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed_another()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed_another", "span.kind" : "test", "test.suite" : "org.example.TestSucceedMultiple", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -151,20 +138,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -186,19 +169,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "pass", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-setup-failure/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-setup-failure/events.ftl index 9b1b956327d..4746c708549 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-setup-failure/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-setup-failure/events.ftl @@ -14,16 +14,12 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "error.type" : "java.lang.RuntimeException", @@ -31,7 +27,6 @@ "error.message" : ${content_meta_error_message}, "test.suite" : "org.example.TestFailedSuiteSetup", "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -60,25 +55,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-7", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteSetup", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "suite set up failed", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -111,25 +102,21 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "skip", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteSetup", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", "test.skip_reason" : "suite set up failed", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -156,20 +143,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -191,19 +174,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-teardown-failure/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-teardown-failure/events.ftl index 6de26d43997..28c43dfe136 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-teardown-failure/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-suite-teardown-failure/events.ftl @@ -14,16 +14,12 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.source.file" : "dummy_source_path", "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "error.type" : "java.lang.RuntimeException", @@ -31,7 +27,6 @@ "error.message" : ${content_meta_error_message}, "test.suite" : "org.example.TestFailedSuiteTearDown", "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } @@ -60,24 +55,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_another_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_another_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteTearDown", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -110,24 +101,20 @@ "test.source.start" : 12 }, "meta" : { - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "dummy_source_path", "test.source.method" : "test_succeed()V", "test.module" : "testng-7", "test.status" : "pass", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, "test.codeowners" : "[\"owner1\",\"owner2\"]", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", "span.kind" : "test", "test.suite" : "org.example.TestFailedSuiteTearDown", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "component" : "testng", @@ -154,20 +141,16 @@ }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "session-name", "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "_dd.profiling.ctx" : "test", "span.kind" : "test_session_end", - "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.command" : "testng-7", "test.framework_version" : ${content_meta_test_framework_version}, @@ -189,19 +172,14 @@ "metrics" : { }, "meta" : { "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : "testng-7", "test.status" : "fail", - "runtime.name" : ${content_meta_runtime_name}, - "runtime.vendor" : ${content_meta_runtime_vendor}, + "test_session.name" : "session-name", "env" : "none", - "os.platform" : ${content_meta_os_platform}, "dummy_ci_tag" : "dummy_ci_tag_value", - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "component" : "testng", "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, "test.framework_version" : ${content_meta_test_framework_version}, "test.framework" : "testng" } diff --git a/dd-smoke-tests/backend-mock/src/main/groovy/datadog/smoketest/MockBackend.groovy b/dd-smoke-tests/backend-mock/src/main/groovy/datadog/smoketest/MockBackend.groovy index 504d5a3ff59..0e1b1a90d27 100644 --- a/dd-smoke-tests/backend-mock/src/main/groovy/datadog/smoketest/MockBackend.groovy +++ b/dd-smoke-tests/backend-mock/src/main/groovy/datadog/smoketest/MockBackend.groovy @@ -272,7 +272,18 @@ class MockBackend implements AutoCloseable { List> events = new ArrayList<>() while (!receivedTraces.isEmpty()) { def trace = receivedTraces.poll() - events.addAll((List>) trace["events"]) + + def traceMetadata = trace["metadata"] + Map metadataForAllEvents = (Map) traceMetadata["*"] + + def traceEvents = (List>) trace["events"] + for (Map event : traceEvents) { + Map eventMetadata = (Map) event["content"]["meta"] + eventMetadata.putAll(metadataForAllEvents) + eventMetadata.putAll(traceMetadata.getOrDefault(event["type"], Collections.emptyMap())) + } + + events.addAll(traceEvents) } return events } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/events.ftl index 1d3867c5136..dfa139a7d4c 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/events.ftl @@ -16,25 +16,27 @@ }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "test.type" : "test", "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", "runtime.name" : ${content_meta_runtime_name}, - "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "os.platform" : ${content_meta_os_platform}, "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, + "span.kind" : "test_session_end", + "runtime.version" : ${content_meta_runtime_version}, + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "gradle test", + "env" : "integration-test", + "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", "error.type" : "org.gradle.internal.exceptions.LocationAwareException", "test.toolchain" : ${content_meta_test_toolchain}, - "span.kind" : "test_session_end", "error.message" : ${content_meta_error_message}, "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, "test.command" : "gradle test" } } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/events.ftl index ab0e26c2edc..622326206a1 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-new-instrumentation/events.ftl @@ -16,25 +16,27 @@ }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "test.type" : "test", "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", "runtime.name" : ${content_meta_runtime_name}, - "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "os.platform" : ${content_meta_os_platform}, "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, + "span.kind" : "test_session_end", + "runtime.version" : ${content_meta_runtime_version}, + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "gradle test", + "env" : "integration-test", + "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", "error.type" : "org.gradle.internal.exceptions.LocationAwareException", "test.toolchain" : ${content_meta_test_toolchain}, - "span.kind" : "test_session_end", "error.message" : ${content_meta_error_message}, "error.stack" : ${content_meta_error_stack}, - "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, "test.command" : "gradle test" } } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl index 8a43b445e78..b48693eb598 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl @@ -19,6 +19,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", @@ -29,17 +30,19 @@ "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", - "error.type" : "org.gradle.internal.exceptions.LocationAwareException", "test.code_coverage.enabled" : "true", + "error.type" : "org.gradle.internal.exceptions.LocationAwareException", "test.toolchain" : ${content_meta_test_toolchain}, "error.message" : ${content_meta_error_message}, - "error.stack" : ${content_meta_error_stack}, "test.itr.tests_skipping.type" : "test", + "error.stack" : ${content_meta_error_stack}, "test.command" : "gradle test", "test.framework_version" : "4.10", "test.framework" : "junit4" @@ -73,8 +76,10 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", @@ -85,7 +90,9 @@ "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -109,6 +116,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.module" : ":test", "test.status" : "fail", @@ -123,6 +131,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -156,6 +165,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", "test.module" : ":test", @@ -172,6 +182,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -207,6 +218,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", "test.module" : ":test", @@ -223,11 +235,13 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, + "test.is_retry" : "true", "component" : "junit", "error.type" : "java.lang.AssertionError", - "error.stack" : ${content_meta_error_stack_3}, + "error.stack" : ${content_meta_error_stack_4}, "test.framework_version" : "4.10", "test.framework" : "junit4" } @@ -258,6 +272,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", "test.module" : ":test", @@ -274,11 +289,13 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, + "test.is_retry" : "true", "component" : "junit", "error.type" : "java.lang.AssertionError", - "error.stack" : ${content_meta_error_stack_3}, + "error.stack" : ${content_meta_error_stack_5}, "test.framework_version" : "4.10", "test.framework" : "junit4" } @@ -309,6 +326,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", "test.module" : ":test", @@ -325,11 +343,13 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, + "test.is_retry" : "true", "component" : "junit", "error.type" : "java.lang.AssertionError", - "error.stack" : ${content_meta_error_stack_3}, + "error.stack" : ${content_meta_error_stack_6}, "test.framework_version" : "4.10", "test.framework" : "junit4" } @@ -360,6 +380,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", "test.module" : ":test", @@ -376,11 +397,13 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, + "test.is_retry" : "true", "component" : "junit", "error.type" : "java.lang.AssertionError", - "error.stack" : ${content_meta_error_stack_3}, + "error.stack" : ${content_meta_error_stack_7}, "test.framework_version" : "4.10", "test.framework" : "junit4" } diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl index 26c7802d884..3f5f80ff5dc 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl @@ -26,8 +26,10 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", @@ -38,7 +40,9 @@ "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -62,6 +66,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.module" : ":test", "test.status" : "fail", @@ -74,8 +79,9 @@ "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestFailed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, + "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -109,6 +115,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", "test.module" : ":test", @@ -123,8 +130,9 @@ "span.kind" : "test", "test.suite" : "datadog.smoke.TestFailed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, + "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -155,6 +163,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", @@ -164,18 +173,20 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id_2}, + "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", - "error.type" : "org.gradle.internal.exceptions.LocationAwareException", "test.code_coverage.enabled" : "true", + "error.type" : "org.gradle.internal.exceptions.LocationAwareException", "test.toolchain" : ${content_meta_test_toolchain}, "error.message" : ${content_meta_error_message}, - "error.stack" : ${content_meta_error_stack_3}, "test.itr.tests_skipping.type" : "test", + "error.stack" : ${content_meta_error_stack_3}, "test.command" : "gradle test", "test.framework_version" : "4.10", "test.framework" : "junit4" diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl index 0d6a9fec06b..141c5e5507d 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl @@ -19,6 +19,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", @@ -29,17 +30,19 @@ "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", - "error.type" : "org.gradle.internal.exceptions.LocationAwareException", "test.code_coverage.enabled" : "true", + "error.type" : "org.gradle.internal.exceptions.LocationAwareException", "test.toolchain" : ${content_meta_test_toolchain}, "error.message" : ${content_meta_error_message}, - "error.stack" : ${content_meta_error_stack}, "test.itr.tests_skipping.type" : "test", + "error.stack" : ${content_meta_error_stack}, "test.command" : "gradle test", "test.framework_version" : "4.10", "test.framework" : "junit4" @@ -73,8 +76,10 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", @@ -85,7 +90,9 @@ "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -109,6 +116,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.module" : ":test", "test.status" : "fail", @@ -123,6 +131,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -156,6 +165,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", "test.module" : ":test", @@ -172,6 +182,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", diff --git a/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/events.ftl index d45905284b5..ec077dce224 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-skip-legacy-instrumentation/events.ftl @@ -18,6 +18,7 @@ "test.module" : ":test", "test.status" : "skip", "test.skip_reason" : "NO-SOURCE", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "runtime.name" : ${content_meta_runtime_name}, "env" : "integration-test", @@ -28,7 +29,9 @@ "component" : "gradle", "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, - "test.command" : "gradle test" + "test.command" : "gradle test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -51,7 +54,9 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "test.type" : "test", "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", "runtime.name" : ${content_meta_runtime_name}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/events.ftl index 291e8416e31..5449faab9e4 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-skip-new-instrumentation/events.ftl @@ -18,7 +18,9 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "test.type" : "test", "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "skip", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", "runtime.name" : ${content_meta_runtime_name}, @@ -55,6 +57,7 @@ "test.module" : ":test", "test.status" : "skip", "test.skip_reason" : "NO-SOURCE", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "runtime.name" : ${content_meta_runtime_name}, "env" : "integration-test", @@ -65,7 +68,9 @@ "component" : "gradle", "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, - "test.command" : "gradle test" + "test.command" : "gradle test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } } ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl index 56663798d32..3ec5a1d934e 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl @@ -19,6 +19,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, @@ -30,8 +31,10 @@ "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", @@ -72,8 +75,10 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", @@ -81,7 +86,9 @@ "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "5.9.3", - "test.framework" : "junit5" + "test.framework" : "junit5", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -105,6 +112,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":test", "test.status" : "pass", @@ -119,6 +127,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -152,6 +161,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : ":test", @@ -168,6 +178,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -201,6 +212,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_to_skip_with_itr()V", "test.module" : ":test", @@ -218,6 +230,7 @@ "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -226,4 +239,4 @@ "test.framework" : "junit5" } } -} ] +} ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl index 98e0dc70488..694a37dee94 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl @@ -27,8 +27,10 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", @@ -36,7 +38,9 @@ "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -60,6 +64,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":test", "test.status" : "pass", @@ -72,8 +77,9 @@ "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, + "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -107,6 +113,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : ":test", @@ -121,8 +128,9 @@ "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, + "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -156,6 +164,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_to_skip_with_itr()V", "test.module" : ":test", @@ -170,9 +179,10 @@ "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, + "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -202,6 +212,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, @@ -212,9 +223,11 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id_2}, + "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", @@ -226,4 +239,4 @@ "test.framework" : "junit4" } } -} ] +} ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl index 539be8b8b54..2a80c0112f7 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl @@ -1,15 +1,4 @@ [ { - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id}, - "files" : [ { - "filename" : "src/test/java/datadog/smoke/TestSucceed.java", - "bitmap" : "gAw=" - }, { - "filename" : "src/main/java/datadog/smoke/Calculator.java", - "bitmap" : "IA==" - } ] -}, { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id_2}, "span_id" : ${content_span_id_2}, @@ -20,4 +9,15 @@ "filename" : "src/test/java/datadog/smoke/TestSucceedJunit5.java", "bitmap" : "AAw=" } ] +}, { + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id}, + "span_id" : ${content_span_id}, + "files" : [ { + "filename" : "src/test/java/datadog/smoke/TestSucceed.java", + "bitmap" : "gAw=" + }, { + "filename" : "src/main/java/datadog/smoke/Calculator.java", + "bitmap" : "IA==" + } ] } ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl index a092ea2d74a..92da3d3a64c 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl @@ -16,26 +16,30 @@ }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "test.type" : "test", "os.architecture" : ${content_meta_os_architecture}, "test.module" : ":test", "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "runtime.name" : ${content_meta_runtime_name}, - "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "os.platform" : ${content_meta_os_platform}, "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, + "span.kind" : "test_module_end", + "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", + "test.itr.tests_skipping.enabled" : "true", + "test.type" : "test", + "test_session.name" : "gradle test", + "env" : "integration-test", + "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", "test.code_coverage.enabled" : "true", - "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.command" : "gradle test", "test.framework_version" : "[\"4.13.2\",\"5.9.3\"]", "test.framework" : "[\"junit4\",\"junit5\"]", - "test.itr.tests_skipping.enabled" : "true" + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -59,6 +63,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":test", "test.status" : "pass", @@ -71,8 +76,9 @@ "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, + "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -106,6 +112,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : ":test", @@ -120,8 +127,9 @@ "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, + "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -150,6 +158,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java", "test.module" : ":test", "test.status" : "pass", @@ -162,8 +171,9 @@ "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceedJunit5", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id_2}, + "runtime-id" : ${content_meta_runtime_id_3}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -197,6 +207,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java", "test.source.method" : "test_succeed()V", "test.module" : ":test", @@ -211,8 +222,9 @@ "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceedJunit5", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id_2}, + "runtime-id" : ${content_meta_runtime_id_3}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -241,6 +253,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", @@ -250,9 +263,11 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id_3}, + "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", @@ -264,4 +279,4 @@ "test.framework" : "[\"junit4\",\"junit5\"]" } } -} ] +} ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl index a9c1fdf69f2..539be8b8b54 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl @@ -20,4 +20,4 @@ "filename" : "src/test/java/datadog/smoke/TestSucceedJunit5.java", "bitmap" : "AAw=" } ] -} ] +} ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl index 8b5bbd16a32..f405ecdd402 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl @@ -19,6 +19,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", @@ -29,8 +30,10 @@ "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", @@ -60,26 +63,30 @@ }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "test.type" : "test", "os.architecture" : ${content_meta_os_architecture}, "test.module" : ":test", "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "runtime.name" : ${content_meta_runtime_name}, - "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "os.platform" : ${content_meta_os_platform}, "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, + "span.kind" : "test_module_end", + "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", + "test.itr.tests_skipping.enabled" : "true", + "test.type" : "test", + "test_session.name" : "gradle test", + "env" : "integration-test", + "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", "test.code_coverage.enabled" : "true", - "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.command" : "gradle test", "test.framework_version" : "[\"4.13.2\",\"5.9.3\"]", "test.framework" : "[\"junit4\",\"junit5\"]", - "test.itr.tests_skipping.enabled" : "true" + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -103,6 +110,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":test", "test.status" : "pass", @@ -117,6 +125,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -150,6 +159,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : ":test", @@ -166,6 +176,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -194,6 +205,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java", "test.module" : ":test", "test.status" : "pass", @@ -208,6 +220,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_3}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -241,6 +254,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java", "test.source.method" : "test_succeed()V", "test.module" : ":test", @@ -257,6 +271,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_3}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -264,4 +279,4 @@ "test.framework" : "junit5" } } -} ] +} ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl index d0df7c2a3c3..f56fb1a2304 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl @@ -16,26 +16,30 @@ }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "test.type" : "test", "os.architecture" : ${content_meta_os_architecture}, "test.module" : ":submodule-a:test", "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "runtime.name" : ${content_meta_runtime_name}, - "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "os.platform" : ${content_meta_os_platform}, "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, + "span.kind" : "test_module_end", + "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", + "test.itr.tests_skipping.enabled" : "true", + "test.type" : "test", + "test_session.name" : "gradle test", + "env" : "integration-test", + "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", "test.code_coverage.enabled" : "true", - "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.command" : "gradle test", "test.framework_version" : "4.10", "test.framework" : "junit4", - "test.itr.tests_skipping.enabled" : "true" + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -56,26 +60,30 @@ }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "test.type" : "test", "os.architecture" : ${content_meta_os_architecture}, "test.module" : ":submodule-b:test", "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "runtime.name" : ${content_meta_runtime_name}, - "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "os.platform" : ${content_meta_os_platform}, "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, + "span.kind" : "test_module_end", + "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", + "test.itr.tests_skipping.enabled" : "true", + "test.type" : "test", + "test_session.name" : "gradle test", + "env" : "integration-test", + "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", "test.code_coverage.enabled" : "true", - "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.command" : "gradle test", "test.framework_version" : "4.10", "test.framework" : "junit4", - "test.itr.tests_skipping.enabled" : "true" + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -99,6 +107,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":submodule-a:test", "test.status" : "pass", @@ -111,8 +120,9 @@ "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, + "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -141,6 +151,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":submodule-b:test", "test.status" : "pass", @@ -153,8 +164,9 @@ "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id_2}, + "runtime-id" : ${content_meta_runtime_id_3}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -188,6 +200,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : ":submodule-a:test", @@ -202,8 +215,9 @@ "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, + "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -237,6 +251,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : ":submodule-b:test", @@ -251,8 +266,9 @@ "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id_2}, + "runtime-id" : ${content_meta_runtime_id_3}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -281,6 +297,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", @@ -290,9 +307,11 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id_3}, + "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl index 7b110f90c75..c2da21bb360 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl @@ -19,6 +19,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", @@ -29,8 +30,10 @@ "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", @@ -60,26 +63,30 @@ }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "test.type" : "test", "os.architecture" : ${content_meta_os_architecture}, "test.module" : ":submodule-a:test", "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "runtime.name" : ${content_meta_runtime_name}, - "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "os.platform" : ${content_meta_os_platform}, "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, + "span.kind" : "test_module_end", + "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", + "test.itr.tests_skipping.enabled" : "true", + "test.type" : "test", + "test_session.name" : "gradle test", + "env" : "integration-test", + "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", "test.code_coverage.enabled" : "true", - "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.command" : "gradle test", "test.framework_version" : "4.10", "test.framework" : "junit4", - "test.itr.tests_skipping.enabled" : "true" + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -100,26 +107,30 @@ }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "test.type" : "test", "os.architecture" : ${content_meta_os_architecture}, "test.module" : ":submodule-b:test", "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "runtime.name" : ${content_meta_runtime_name}, - "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "os.platform" : ${content_meta_os_platform}, "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, + "span.kind" : "test_module_end", + "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", + "test.itr.tests_skipping.enabled" : "true", + "test.type" : "test", + "test_session.name" : "gradle test", + "env" : "integration-test", + "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", "test.code_coverage.enabled" : "true", - "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", - "runtime.version" : ${content_meta_runtime_version}, "test.command" : "gradle test", "test.framework_version" : "4.10", "test.framework" : "junit4", - "test.itr.tests_skipping.enabled" : "true" + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -143,6 +154,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":submodule-a:test", "test.status" : "pass", @@ -157,6 +169,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -185,6 +198,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":submodule-b:test", "test.status" : "pass", @@ -199,6 +213,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_3}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -232,6 +247,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : ":submodule-a:test", @@ -248,6 +264,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -281,6 +298,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : ":submodule-b:test", @@ -297,6 +315,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_3}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl index 90848e05a24..ca6e00d6f4d 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl @@ -19,6 +19,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, @@ -30,8 +31,10 @@ "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", @@ -72,8 +75,10 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", @@ -81,7 +86,9 @@ "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -105,6 +112,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":test", "test.status" : "pass", @@ -119,6 +127,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -152,6 +161,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : ":test", @@ -168,6 +178,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -201,6 +212,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_to_skip_with_itr()V", "test.module" : ":test", @@ -218,6 +230,7 @@ "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -226,4 +239,4 @@ "test.framework" : "junit4" } } -} ] +} ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl index 77144710f7b..b8b60ad8f0e 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl @@ -27,8 +27,10 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", @@ -36,7 +38,9 @@ "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -60,6 +64,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":test", "test.status" : "pass", @@ -72,8 +77,9 @@ "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, + "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -107,6 +113,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : ":test", @@ -121,8 +128,9 @@ "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, + "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -156,6 +164,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_to_skip_with_itr()V", "test.module" : ":test", @@ -170,9 +179,10 @@ "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, + "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -202,6 +212,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, @@ -212,9 +223,11 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id_2}, + "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "gradle test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "gradle", diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl index da51e874229..7ea3c1316e5 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl @@ -18,6 +18,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", @@ -29,11 +30,12 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", - "error.type" : "org.apache.maven.lifecycle.LifecycleExecutionException", "test.code_coverage.enabled" : "true", + "error.type" : "org.apache.maven.lifecycle.LifecycleExecutionException", "test.toolchain" : ${content_meta_test_toolchain}, "error.message" : ${content_meta_error_message}, "error.stack" : ${content_meta_error_stack}, @@ -70,6 +72,7 @@ "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", @@ -80,7 +83,9 @@ "error.stack" : ${content_meta_error_stack_2}, "test.command" : "mvn -B test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -104,6 +109,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "fail", @@ -118,6 +124,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -151,6 +158,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -167,6 +175,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -202,6 +211,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -218,6 +228,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "test.is_retry" : "true", @@ -254,6 +265,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -270,6 +282,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "test.is_retry" : "true", @@ -306,6 +319,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -322,6 +336,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "test.is_retry" : "true", @@ -358,6 +373,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -374,6 +390,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "test.is_retry" : "true", @@ -384,4 +401,4 @@ "test.framework" : "junit4" } } -} ] +} ] \ No newline at end of file diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl index ddd295b5aa9..41804685f15 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl @@ -19,6 +19,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, @@ -30,12 +31,13 @@ "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", - "test.code_coverage.backfilled" : "true", "test.code_coverage.enabled" : "true", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", @@ -73,18 +75,21 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", - "test.code_coverage.backfilled" : "true", "test.code_coverage.enabled" : "true", "test.execution" : "maven-surefire-plugin:test:default-test", "test.itr.tests_skipping.type" : "test", "test.command" : "mvn -B test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -108,6 +113,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", @@ -122,6 +128,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -154,6 +161,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -170,6 +178,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -202,6 +211,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_to_skip_with_itr()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -219,6 +229,7 @@ "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl index 9255504943a..c53a01e2eb7 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl @@ -18,6 +18,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, @@ -31,6 +32,7 @@ "runtime-id" : ${content_meta_runtime_id}, "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", @@ -72,6 +74,7 @@ "runtime.version" : ${content_meta_runtime_version}, "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", @@ -80,7 +83,9 @@ "test.itr.tests_skipping.type" : "test", "test.command" : "mvn -B test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -104,6 +109,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", @@ -118,6 +124,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -151,6 +158,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -167,6 +175,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -200,6 +209,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_to_skip_with_itr()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -217,6 +227,7 @@ "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl index 0a8fa3a1f55..b4d47f4f50e 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl @@ -17,6 +17,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", @@ -28,6 +29,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", @@ -50,14 +52,14 @@ "start" : ${content_start_2}, "duration" : ${content_duration_2}, "error" : 0, - "metrics" : { - }, + "metrics" : { }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "test.type" : "test", "os.architecture" : ${content_meta_os_architecture}, "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "runtime.name" : ${content_meta_runtime_name}, "env" : "integration-test", @@ -72,7 +74,9 @@ "runtime.version" : ${content_meta_runtime_version}, "test.command" : "mvn -B test", "test.framework_version" : "2.4.0-M2-groovy-4.0", - "test.framework" : "spock" + "test.framework" : "spock", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -96,6 +100,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, @@ -109,6 +114,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -140,6 +146,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.method" : "test should pass()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", @@ -155,6 +162,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -162,4 +170,4 @@ "test.framework" : "spock" } } -} ] +} ] \ No newline at end of file diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl index 7945d235313..ecf435df0c5 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl @@ -19,6 +19,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, @@ -33,6 +34,7 @@ "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", @@ -73,18 +75,21 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", - "test.code_coverage.backfilled" : "true", "test.code_coverage.enabled" : "true", "test.execution" : "maven-surefire-plugin:test:default-test", "test.itr.tests_skipping.type" : "test", "test.command" : "mvn -B test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -108,6 +113,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", @@ -122,6 +128,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -155,6 +162,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -171,6 +179,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -204,6 +213,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_to_skip_with_itr()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -221,6 +231,7 @@ "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -229,4 +240,4 @@ "test.framework" : "junit4" } } -} ] +} ] \ No newline at end of file diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl index 3faeddd8d8d..ecf435df0c5 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl @@ -19,6 +19,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, @@ -30,12 +31,13 @@ "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", - "test.code_coverage.backfilled" : "true", "test.code_coverage.enabled" : "true", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", @@ -73,18 +75,21 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", - "test.code_coverage.backfilled" : "true", "test.code_coverage.enabled" : "true", "test.execution" : "maven-surefire-plugin:test:default-test", "test.itr.tests_skipping.type" : "test", "test.command" : "mvn -B test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -108,6 +113,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", @@ -122,6 +128,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -155,6 +162,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -171,6 +179,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -204,6 +213,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_to_skip_with_itr()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -221,6 +231,7 @@ "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -229,4 +240,4 @@ "test.framework" : "junit4" } } -} ] +} ] \ No newline at end of file diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl index 8960ae34eec..3d4c6bb68d2 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl @@ -17,6 +17,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", @@ -28,6 +29,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", @@ -50,14 +52,14 @@ "start" : ${content_start_2}, "duration" : ${content_duration_2}, "error" : 0, - "metrics" : { - }, + "metrics" : { }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "test.type" : "test", "os.architecture" : ${content_meta_os_architecture}, "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "runtime.name" : ${content_meta_runtime_name}, "env" : "integration-test", @@ -72,7 +74,9 @@ "runtime.version" : ${content_meta_runtime_version}, "test.command" : "mvn -B test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -96,6 +100,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceedPropertyAssertion.java", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", @@ -110,6 +115,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -143,6 +149,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceedPropertyAssertion.java", "test.source.method" : "test_succeed()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -159,6 +166,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -166,4 +174,4 @@ "test.framework" : "junit4" } } -} ] +} ] \ No newline at end of file diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl index b1483019a0d..19ccda8882f 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl @@ -20,7 +20,9 @@ "step.type" : "io.cucumber.java.JavaStepDefinition", "step.arguments" : "[4, 5]", "step.name" : "I add {int} and {int}", - "env" : "integration-test" + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -43,6 +45,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", @@ -52,8 +55,9 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id}, + "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", @@ -81,25 +85,28 @@ }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", "os.architecture" : ${content_meta_os_architecture}, "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "runtime.name" : ${content_meta_runtime_name}, + "env" : "integration-test", + "runtime.vendor" : ${content_meta_runtime_vendor}, "os.platform" : ${content_meta_os_platform}, "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, - "span.kind" : "test_module_end", - "runtime.version" : ${content_meta_runtime_version}, - "test.type" : "test", - "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.execution" : "maven-surefire-plugin:test:default-test", + "runtime.version" : ${content_meta_runtime_version}, "test.command" : "mvn -B test", "test.framework_version" : "5.4.0", - "test.framework" : "cucumber" + "test.framework" : "cucumber", + "runtime-id" : ${content_meta_runtime_id_2}, + "language" : "jvm" } } }, { @@ -123,7 +130,9 @@ "step.name" : "a calculator I just turned on", "env" : "integration-test", "step.location" : "datadog.smoke.calculator.CalculatorSteps.a_calculator_I_just_turned_on()", - "step.type" : "io.cucumber.java.JavaStepDefinition" + "step.type" : "io.cucumber.java.JavaStepDefinition", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -147,6 +156,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, @@ -158,8 +168,9 @@ "span.kind" : "test_suite_end", "test.suite" : "classpath:datadog/smoke/basic_arithmetic.feature:Basic Arithmetic", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id_2}, + "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -191,6 +202,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, @@ -203,8 +215,9 @@ "span.kind" : "test", "test.suite" : "classpath:datadog/smoke/basic_arithmetic.feature:Basic Arithmetic", "runtime.version" : ${content_meta_runtime_version}, - "runtime-id" : ${content_meta_runtime_id_2}, + "runtime-id" : ${content_meta_runtime_id}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -234,7 +247,9 @@ "step.type" : "io.cucumber.java.JavaStepDefinition", "step.arguments" : "[9]", "step.name" : "the result is {int}", - "env" : "integration-test" + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } -} ] +} ] \ No newline at end of file diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl index 3faeddd8d8d..ecf435df0c5 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl @@ -19,6 +19,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", "ci.workspace_path" : ${content_meta_ci_workspace_path}, @@ -30,12 +31,13 @@ "span.kind" : "test_session_end", "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", - "test.code_coverage.backfilled" : "true", "test.code_coverage.enabled" : "true", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", @@ -73,18 +75,21 @@ "library_version" : ${content_meta_library_version}, "span.kind" : "test_module_end", "runtime.version" : ${content_meta_runtime_version}, + "test.code_coverage.backfilled" : "true", "test.itr.tests_skipping.enabled" : "true", "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "maven", - "test.code_coverage.backfilled" : "true", "test.code_coverage.enabled" : "true", "test.execution" : "maven-surefire-plugin:test:default-test", "test.itr.tests_skipping.type" : "test", "test.command" : "mvn -B test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm" } } }, { @@ -108,6 +113,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", @@ -122,6 +128,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -155,6 +162,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -171,6 +179,7 @@ "runtime.version" : ${content_meta_runtime_version}, "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -204,6 +213,7 @@ "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "os.architecture" : ${content_meta_os_architecture}, + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_to_skip_with_itr()V", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -221,6 +231,7 @@ "runtime-id" : ${content_meta_runtime_id_2}, "test.type" : "test", "test.skip_reason" : "Skipped by Datadog Intelligent Test Runner", + "test_session.name" : "mvn -B test", "env" : "integration-test", "runtime.vendor" : ${content_meta_runtime_vendor}, "component" : "junit", @@ -229,4 +240,4 @@ "test.framework" : "junit4" } } -} ] +} ] \ No newline at end of file diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java index c624e5abad4..2df3062a480 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java @@ -63,6 +63,7 @@ public final class CiVisibilityConfig { public static final String CIVISIBILITY_TOTAL_FLAKY_RETRY_COUNT = "civisibility.total.flaky.retry.count"; public static final String CIVISIBILITY_MODULE_NAME = "civisibility.module.name"; + public static final String CIVISIBILITY_TEST_COMMAND = "civisibility.test.command"; public static final String CIVISIBILITY_TELEMETRY_ENABLED = "civisibility.telemetry.enabled"; public static final String CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS = "civisibility.rum.flush.wait.millis"; @@ -86,5 +87,7 @@ public final class CiVisibilityConfig { "civisibility.jacoco.plugin.version"; public static final String CIVISIBILITY_GRADLE_SOURCE_SETS = "civisibility.gradle.sourcesets"; + public static final String SESSION_NAME = "session.name"; + private CiVisibilityConfig() {} } diff --git a/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityApmProtocolInterceptor.java b/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityApmProtocolInterceptor.java index 589fba522db..2fa53ed0fd7 100644 --- a/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityApmProtocolInterceptor.java +++ b/dd-trace-core/src/main/java/datadog/trace/civisibility/interceptor/CiVisibilityApmProtocolInterceptor.java @@ -1,6 +1,8 @@ package datadog.trace.civisibility.interceptor; +import datadog.trace.api.Config; import datadog.trace.api.DDSpanTypes; +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags; import datadog.trace.api.interceptor.AbstractTraceInterceptor; import datadog.trace.api.interceptor.MutableSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; @@ -11,15 +13,19 @@ /** * An interceptor that removes spans and tags that are not supported in the APM protocol (some spans * and tags related to certain CI Visibility features, e.g. Test Suite Level Visibility, can only be - * written with CI Test Cycle protocol) + * written with CI Test Cycle protocol). Also sets common CI Visibility tags (that are otherwise set + * in intake message header when CI Test Cycle protocol is used). */ public class CiVisibilityApmProtocolInterceptor extends AbstractTraceInterceptor { public static final CiVisibilityApmProtocolInterceptor INSTANCE = - new CiVisibilityApmProtocolInterceptor(Priority.CI_VISIBILITY_APM); + new CiVisibilityApmProtocolInterceptor(Priority.CI_VISIBILITY_APM, Config.get()); - protected CiVisibilityApmProtocolInterceptor(Priority priority) { + private final CiVisibilityWellKnownTags wellKnownTags; + + protected CiVisibilityApmProtocolInterceptor(Priority priority, Config config) { super(priority); + wellKnownTags = config.getCiVisibilityWellKnownTags(); } @Override @@ -32,6 +38,16 @@ public Collection onTraceComplete( span.setTag(Tags.TEST_SESSION_ID, (Number) null); span.setTag(Tags.TEST_MODULE_ID, (Number) null); span.setTag(Tags.TEST_SUITE_ID, (Number) null); + + String spanType = span.getSpanType(); + if (DDSpanTypes.TEST.equals(spanType)) { + span.setTag(Tags.RUNTIME_NAME, wellKnownTags.getRuntimeName().toString()); + span.setTag(Tags.RUNTIME_VENDOR, wellKnownTags.getRuntimeVendor().toString()); + span.setTag(Tags.RUNTIME_VERSION, wellKnownTags.getRuntimeVersion().toString()); + span.setTag(Tags.OS_ARCHITECTURE, wellKnownTags.getOsArch().toString()); + span.setTag(Tags.OS_PLATFORM, wellKnownTags.getOsPlatform().toString()); + span.setTag(Tags.OS_VERSION, wellKnownTags.getOsVersion().toString()); + } } return filteredTrace; } diff --git a/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java b/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java index 8de23e63ccf..ef7c31575ef 100644 --- a/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java +++ b/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java @@ -6,7 +6,7 @@ import datadog.communication.serialization.GrowableBuffer; import datadog.communication.serialization.Writable; import datadog.communication.serialization.msgpack.MsgPackWriter; -import datadog.trace.api.WellKnownTags; +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags; import datadog.trace.api.civisibility.InstrumentationBridge; import datadog.trace.api.civisibility.telemetry.CiVisibilityDistributionMetric; import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector; @@ -42,27 +42,36 @@ public class CiTestCycleMapperV1 implements RemoteMapper { private static final byte[] TYPE = "type".getBytes(StandardCharsets.UTF_8); private static final byte[] CONTENT = "content".getBytes(StandardCharsets.UTF_8); + private static final byte[] RUNTIME_NAME = Tags.RUNTIME_NAME.getBytes(StandardCharsets.UTF_8); + private static final byte[] RUNTIME_VENDOR = Tags.RUNTIME_VENDOR.getBytes(StandardCharsets.UTF_8); + private static final byte[] RUNTIME_VERSION = + Tags.RUNTIME_VERSION.getBytes(StandardCharsets.UTF_8); + private static final byte[] OS_ARCHITECTURE = + Tags.OS_ARCHITECTURE.getBytes(StandardCharsets.UTF_8); + private static final byte[] OS_PLATFORM = Tags.OS_PLATFORM.getBytes(StandardCharsets.UTF_8); + private static final byte[] OS_VERSION = Tags.OS_VERSION.getBytes(StandardCharsets.UTF_8); + private static final UTF8BytesString SPAN_TYPE = UTF8BytesString.create("span"); private static final Collection DEFAULT_TOP_LEVEL_TAGS = Arrays.asList( Tags.TEST_SESSION_ID, Tags.TEST_MODULE_ID, Tags.TEST_SUITE_ID, Tags.ITR_CORRELATION_ID); - private final WellKnownTags wellKnownTags; + private final CiVisibilityWellKnownTags wellKnownTags; private final Collection topLevelTags; private final int size; private final GrowableBuffer headerBuffer; private final MsgPackWriter headerWriter; private final boolean compressionEnabled; - private int eventCount = 0; - private int serializationTimeMillis = 0; + private int eventCount; + private int serializationTimeMillis; - public CiTestCycleMapperV1(WellKnownTags wellKnownTags, boolean compressionEnabled) { + public CiTestCycleMapperV1(CiVisibilityWellKnownTags wellKnownTags, boolean compressionEnabled) { this(wellKnownTags, DEFAULT_TOP_LEVEL_TAGS, 5 << 20, compressionEnabled); } private CiTestCycleMapperV1( - WellKnownTags wellKnownTags, + CiVisibilityWellKnownTags wellKnownTags, Collection topLevelTags, int size, boolean compressionEnabled) { @@ -219,7 +228,7 @@ private void writeHeader() { headerWriter.startMap(1); /* 2,1 */ headerWriter.writeUTF8(METADATA_ASTERISK); - headerWriter.startMap(3); + headerWriter.startMap(9); /* 2,1,1 */ headerWriter.writeUTF8(ENV); headerWriter.writeUTF8(wellKnownTags.getEnv()); @@ -229,6 +238,24 @@ private void writeHeader() { /* 2,1,3 */ headerWriter.writeUTF8(LANGUAGE); headerWriter.writeUTF8(wellKnownTags.getLanguage()); + /* 2,1,4 */ + headerWriter.writeUTF8(RUNTIME_NAME); + headerWriter.writeUTF8(wellKnownTags.getRuntimeName()); + /* 2,1,5 */ + headerWriter.writeUTF8(RUNTIME_VENDOR); + headerWriter.writeUTF8(wellKnownTags.getRuntimeVendor()); + /* 2,1,6 */ + headerWriter.writeUTF8(RUNTIME_VERSION); + headerWriter.writeUTF8(wellKnownTags.getRuntimeVersion()); + /* 2,1,7 */ + headerWriter.writeUTF8(OS_ARCHITECTURE); + headerWriter.writeUTF8(wellKnownTags.getOsArch()); + /* 2,1,8 */ + headerWriter.writeUTF8(OS_PLATFORM); + headerWriter.writeUTF8(wellKnownTags.getOsPlatform()); + /* 2,1,9 */ + headerWriter.writeUTF8(OS_VERSION); + headerWriter.writeUTF8(wellKnownTags.getOsVersion()); /* 3 */ headerWriter.writeUTF8(EVENTS); headerWriter.startArray(eventCount); diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/DDIntakeWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/DDIntakeWriter.java index 7075266352c..614865a6b5e 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/writer/DDIntakeWriter.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/DDIntakeWriter.java @@ -3,7 +3,7 @@ import datadog.communication.ddagent.DroppingPolicy; import datadog.communication.monitor.Monitoring; import datadog.trace.api.Config; -import datadog.trace.api.WellKnownTags; +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags; import datadog.trace.api.intake.TrackType; import datadog.trace.common.sampling.SingleSpanSampler; import datadog.trace.common.writer.ddagent.Prioritization; @@ -25,7 +25,7 @@ public static DDIntakeWriterBuilder builder() { } public static class DDIntakeWriterBuilder { - WellKnownTags wellKnownTags = Config.get().getWellKnownTags(); + CiVisibilityWellKnownTags wellKnownTags = Config.get().getCiVisibilityWellKnownTags(); int traceBufferSize = BUFFER_SIZE; HealthMetrics healthMetrics = HealthMetrics.NO_OP; int flushIntervalMilliseconds = 1000; @@ -75,7 +75,7 @@ public DDIntakeWriterBuilder droppingPolicy(final DroppingPolicy droppingPolicy) return this; } - public DDIntakeWriterBuilder wellKnownTags(final WellKnownTags wellKnownTags) { + public DDIntakeWriterBuilder wellKnownTags(final CiVisibilityWellKnownTags wellKnownTags) { this.wellKnownTags = wellKnownTags; return this; } diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeMapperDiscovery.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeMapperDiscovery.java index 4d375d7ee11..6cc38f8a3a6 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeMapperDiscovery.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddintake/DDIntakeMapperDiscovery.java @@ -1,6 +1,6 @@ package datadog.trace.common.writer.ddintake; -import datadog.trace.api.WellKnownTags; +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags; import datadog.trace.api.intake.TrackType; import datadog.trace.civisibility.writer.ddintake.CiTestCovMapperV2; import datadog.trace.civisibility.writer.ddintake.CiTestCycleMapperV1; @@ -15,13 +15,15 @@ public class DDIntakeMapperDiscovery implements RemoteMapperDiscovery { private final TrackType trackType; - private final WellKnownTags wellKnownTags; + private final CiVisibilityWellKnownTags wellKnownTags; private final boolean compressionEnabled; private RemoteMapper mapper; public DDIntakeMapperDiscovery( - final TrackType trackType, final WellKnownTags wellKnownTags, boolean compressionEnabled) { + final TrackType trackType, + final CiVisibilityWellKnownTags wellKnownTags, + boolean compressionEnabled) { this.trackType = trackType; this.wellKnownTags = wellKnownTags; this.compressionEnabled = compressionEnabled; diff --git a/dd-trace-core/src/test/groovy/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1PayloadTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1PayloadTest.groovy index 50516c8855f..0795d8815c3 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1PayloadTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1PayloadTest.groovy @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper import datadog.communication.serialization.ByteBufferConsumer import datadog.communication.serialization.FlushingBuffer import datadog.communication.serialization.msgpack.MsgPackWriter -import datadog.trace.api.WellKnownTags +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.common.writer.Payload @@ -43,10 +43,15 @@ class CiTestCycleMapperV1PayloadTest extends DDSpecification { def "test traces written correctly with bufferSize=#bufferSize, traceCount=#traceCount, lowCardinality=#lowCardinality"() { setup: - List> traces = generateRandomTraces(traceCount, lowCardinality) - WellKnownTags wellKnownTags = new WellKnownTags("runtimeid", "hostname", "my-env", "service", "version", "language") + CiVisibilityWellKnownTags wellKnownTags = new CiVisibilityWellKnownTags( + "runtimeid", "my-env", "language", + "my-runtime-name", "my-runtime-version", "my-runtime-vendor", + "my-os-arch", "my-os-platform", "my-os-version") CiTestCycleMapperV1 mapper = new CiTestCycleMapperV1(wellKnownTags, false) + + List> traces = generateRandomTraces(traceCount, lowCardinality) PayloadVerifier verifier = new PayloadVerifier(wellKnownTags, traces, mapper) + MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(bufferSize, verifier)) when: boolean tracesFitInBuffer = true @@ -177,7 +182,10 @@ class CiTestCycleMapperV1PayloadTest extends DDSpecification { private static Map whenASpanIsWritten(TraceGenerator.PojoSpan span) { List trace = Collections.singletonList(span) - WellKnownTags wellKnownTags = new WellKnownTags("runtimeid", "hostname", "my-env", "service", "version", "language") + CiVisibilityWellKnownTags wellKnownTags = new CiVisibilityWellKnownTags( + "runtimeid", "my-env", "language", + "my-runtime-name", "my-runtime-version", "my-runtime-vendor", + "my-os-arch", "my-os-platform", "my-os-version") CiTestCycleMapperV1 mapper = new CiTestCycleMapperV1(wellKnownTags, false) ByteBufferConsumer consumer = new CaptureConsumer() @@ -204,12 +212,12 @@ class CiTestCycleMapperV1PayloadTest extends DDSpecification { private final List> expectedTraces private final CiTestCycleMapperV1 mapper - private final WellKnownTags wellKnownTags + private final CiVisibilityWellKnownTags wellKnownTags private ByteBuffer captured = ByteBuffer.allocate(200 << 10) private int position = 0 - private PayloadVerifier(WellKnownTags wellKnownTags, List> traces, CiTestCycleMapperV1 mapper) { + private PayloadVerifier(CiVisibilityWellKnownTags wellKnownTags, List> traces, CiTestCycleMapperV1 mapper) { this.expectedTraces = traces this.mapper = mapper this.wellKnownTags = wellKnownTags @@ -241,13 +249,27 @@ class CiTestCycleMapperV1PayloadTest extends DDSpecification { assertEquals("metadata", unpacker.unpackString()) assertEquals(1, unpacker.unpackMapHeader()) assertEquals("*", unpacker.unpackString()) - assertEquals(3, unpacker.unpackMapHeader()) + + assertEquals(9, unpacker.unpackMapHeader()) assertEquals("env", unpacker.unpackString()) assertEquals(wellKnownTags.env as String, unpacker.unpackString()) assertEquals("runtime-id", unpacker.unpackString()) assertEquals(wellKnownTags.runtimeId as String, unpacker.unpackString()) assertEquals("language", unpacker.unpackString()) assertEquals(wellKnownTags.language as String, unpacker.unpackString()) + assertEquals(Tags.RUNTIME_NAME, unpacker.unpackString()) + assertEquals(wellKnownTags.runtimeName as String, unpacker.unpackString()) + assertEquals(Tags.RUNTIME_VENDOR, unpacker.unpackString()) + assertEquals(wellKnownTags.runtimeVendor as String, unpacker.unpackString()) + assertEquals(Tags.RUNTIME_VERSION, unpacker.unpackString()) + assertEquals(wellKnownTags.runtimeVersion as String, unpacker.unpackString()) + assertEquals(Tags.OS_ARCHITECTURE, unpacker.unpackString()) + assertEquals(wellKnownTags.osArch as String, unpacker.unpackString()) + assertEquals(Tags.OS_PLATFORM, unpacker.unpackString()) + assertEquals(wellKnownTags.osPlatform as String, unpacker.unpackString()) + assertEquals(Tags.OS_VERSION, unpacker.unpackString()) + assertEquals(wellKnownTags.osVersion as String, unpacker.unpackString()) + assertEquals("events", unpacker.unpackString()) List expectedTrace = expectedTraces.get(position++) diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy index c1835f94cb9..e8cde931a4b 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy @@ -7,7 +7,7 @@ import datadog.communication.serialization.msgpack.MsgPackWriter import datadog.trace.api.DDSpanId import datadog.trace.api.DDTraceId import datadog.trace.api.StatsDClient -import datadog.trace.api.WellKnownTags +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags import datadog.trace.api.intake.TrackType import datadog.trace.api.sampling.PrioritySampling import datadog.trace.bootstrap.instrumentation.api.AgentTracer @@ -43,7 +43,10 @@ import static datadog.trace.common.writer.ddagent.Prioritization.ENSURE_TRACE class DDIntakeWriterCombinedTest extends DDCoreSpecification { @Shared - def wellKnownTags = new WellKnownTags("my-runtime-id","my-hostname","my-env","my-service","my-version","my-language") + def wellKnownTags = new CiVisibilityWellKnownTags( + "my-runtime-id", "my-env", "my-language", + "my-runtime-name", "my-runtime-version", "my-runtime-vendor", + "my-os-arch", "my-os-platform", "my-os-version") def conditions = new PollingConditions(timeout: 5, initialDelay: 0, factor: 1.25) def monitoring = new MonitoringImpl(StatsDClient.NO_OP, 1, TimeUnit.SECONDS) diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.groovy index 36b55b6868a..bf8a07a5db8 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDEvpProxyApiTest.groovy @@ -5,10 +5,10 @@ import com.fasterxml.jackson.databind.ObjectMapper import datadog.communication.serialization.ByteBufferConsumer import datadog.communication.serialization.FlushingBuffer import datadog.communication.serialization.msgpack.MsgPackWriter -import datadog.trace.api.WellKnownTags -import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags import datadog.trace.api.intake.TrackType import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes +import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.common.writer.Payload import datadog.trace.core.DDSpan import datadog.trace.core.test.DDCoreSpecification @@ -27,7 +27,11 @@ import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer @Timeout(20) class DDEvpProxyApiTest extends DDCoreSpecification { - static WellKnownTags wellKnownTags = new WellKnownTags("my-runtime-id", "my-hostname", "my-env", "my-service", "my-version", "my-language") + static CiVisibilityWellKnownTags wellKnownTags = new CiVisibilityWellKnownTags( + "my-runtime-id", "my-env", "my-language", + "my-runtime-name", "my-runtime-version", "my-runtime-vendor", + "my-os-arch", "my-os-platform", "my-os-version") + static String intakeSubdomain = "citestcycle-intake" static msgPackMapper = new ObjectMapper(new MessagePackFactory()) @@ -133,9 +137,15 @@ class DDEvpProxyApiTest extends DDCoreSpecification { "version" : 1, "metadata": new TreeMap<>([ "*": new TreeMap<>([ - "env" : "my-env", - "runtime-id": "my-runtime-id", - "language" : "my-language" + "env" : "my-env", + "runtime-id" : "my-runtime-id", + "language" : "my-language", + (Tags.RUNTIME_NAME) : "my-runtime-name", + (Tags.RUNTIME_VERSION): "my-runtime-version", + (Tags.RUNTIME_VENDOR) : "my-runtime-vendor", + (Tags.OS_ARCHITECTURE): "my-os-arch", + (Tags.OS_PLATFORM) : "my-os-platform", + (Tags.OS_VERSION) : "my-os-version" ])]), "events" : [new TreeMap<>([ "type" : "span", @@ -161,7 +171,13 @@ class DDEvpProxyApiTest extends DDCoreSpecification { "*": new TreeMap<>([ "env" : "my-env", "runtime-id": "my-runtime-id", - "language" : "my-language" + "language" : "my-language", + (Tags.RUNTIME_NAME): "my-runtime-name", + (Tags.RUNTIME_VERSION): "my-runtime-version", + (Tags.RUNTIME_VENDOR): "my-runtime-vendor", + (Tags.OS_ARCHITECTURE): "my-os-arch", + (Tags.OS_PLATFORM): "my-os-platform", + (Tags.OS_VERSION): "my-os-version" ])]), "events" : [new TreeMap<>([ "type" : "test", @@ -189,7 +205,13 @@ class DDEvpProxyApiTest extends DDCoreSpecification { "*": new TreeMap<>([ "env" : "my-env", "runtime-id": "my-runtime-id", - "language" : "my-language" + "language" : "my-language", + (Tags.RUNTIME_NAME): "my-runtime-name", + (Tags.RUNTIME_VERSION): "my-runtime-version", + (Tags.RUNTIME_VENDOR): "my-runtime-vendor", + (Tags.OS_ARCHITECTURE): "my-os-arch", + (Tags.OS_PLATFORM): "my-os-platform", + (Tags.OS_VERSION): "my-os-version" ])]), "events" : [new TreeMap<>([ "type" : "test_suite_end", @@ -214,7 +236,13 @@ class DDEvpProxyApiTest extends DDCoreSpecification { "*": new TreeMap<>([ "env" : "my-env", "runtime-id": "my-runtime-id", - "language" : "my-language" + "language" : "my-language", + (Tags.RUNTIME_NAME): "my-runtime-name", + (Tags.RUNTIME_VERSION): "my-runtime-version", + (Tags.RUNTIME_VENDOR): "my-runtime-vendor", + (Tags.OS_ARCHITECTURE): "my-os-arch", + (Tags.OS_PLATFORM): "my-os-platform", + (Tags.OS_VERSION): "my-os-version" ])]), "events" : [new TreeMap<>([ "type" : "test_module_end", diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeApiTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeApiTest.groovy index bfd496740c0..cb7f70571ee 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeApiTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/ddintake/DDIntakeApiTest.groovy @@ -6,9 +6,11 @@ import datadog.communication.serialization.ByteBufferConsumer import datadog.communication.serialization.FlushingBuffer import datadog.communication.serialization.msgpack.MsgPackWriter import datadog.trace.api.WellKnownTags +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector import datadog.trace.api.intake.TrackType import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes +import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.common.writer.Payload import datadog.trace.core.DDSpan import datadog.trace.core.test.DDCoreSpecification @@ -25,7 +27,11 @@ import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer @Timeout(20) class DDIntakeApiTest extends DDCoreSpecification { - static WellKnownTags wellKnownTags = new WellKnownTags("my-runtime-id", "my-hostname", "my-env", "my-service", "my-version", "my-language") + static CiVisibilityWellKnownTags wellKnownTags = new CiVisibilityWellKnownTags( + "my-runtime-id", "my-env", "my-language", + "my-runtime-name", "my-runtime-version", "my-runtime-vendor", + "my-os-arch", "my-os-platform", "my-os-version") + static String apiKey = "my-secret-apikey" static msgPackMapper = new ObjectMapper(new MessagePackFactory()) @@ -164,7 +170,13 @@ class DDIntakeApiTest extends DDCoreSpecification { "*": new TreeMap<>([ "env" : "my-env", "runtime-id": "my-runtime-id", - "language" : "my-language" + "language" : "my-language", + (Tags.RUNTIME_NAME): "my-runtime-name", + (Tags.RUNTIME_VERSION): "my-runtime-version", + (Tags.RUNTIME_VENDOR): "my-runtime-vendor", + (Tags.OS_ARCHITECTURE): "my-os-arch", + (Tags.OS_PLATFORM): "my-os-platform", + (Tags.OS_VERSION): "my-os-version" ])]), "events" : [new TreeMap<>([ "type" : "span", @@ -190,7 +202,13 @@ class DDIntakeApiTest extends DDCoreSpecification { "*": new TreeMap<>([ "env" : "my-env", "runtime-id": "my-runtime-id", - "language" : "my-language" + "language" : "my-language", + (Tags.RUNTIME_NAME): "my-runtime-name", + (Tags.RUNTIME_VERSION): "my-runtime-version", + (Tags.RUNTIME_VENDOR): "my-runtime-vendor", + (Tags.OS_ARCHITECTURE): "my-os-arch", + (Tags.OS_PLATFORM): "my-os-platform", + (Tags.OS_VERSION): "my-os-version" ])]), "events" : [new TreeMap<>([ "type" : "test", @@ -218,7 +236,13 @@ class DDIntakeApiTest extends DDCoreSpecification { "*": new TreeMap<>([ "env" : "my-env", "runtime-id": "my-runtime-id", - "language" : "my-language" + "language" : "my-language", + (Tags.RUNTIME_NAME): "my-runtime-name", + (Tags.RUNTIME_VERSION): "my-runtime-version", + (Tags.RUNTIME_VENDOR): "my-runtime-vendor", + (Tags.OS_ARCHITECTURE): "my-os-arch", + (Tags.OS_PLATFORM): "my-os-platform", + (Tags.OS_VERSION): "my-os-version" ])]), "events" : [new TreeMap<>([ "type" : "test_suite_end", @@ -243,7 +267,13 @@ class DDIntakeApiTest extends DDCoreSpecification { "*": new TreeMap<>([ "env" : "my-env", "runtime-id": "my-runtime-id", - "language" : "my-language" + "language" : "my-language", + (Tags.RUNTIME_NAME): "my-runtime-name", + (Tags.RUNTIME_VERSION): "my-runtime-version", + (Tags.RUNTIME_VENDOR): "my-runtime-vendor", + (Tags.OS_ARCHITECTURE): "my-os-arch", + (Tags.OS_PLATFORM): "my-os-platform", + (Tags.OS_VERSION): "my-os-version" ])]), "events" : [new TreeMap<>([ "type" : "test_module_end", diff --git a/internal-api/build.gradle b/internal-api/build.gradle index 2af646eaf47..45e793f9008 100644 --- a/internal-api/build.gradle +++ b/internal-api/build.gradle @@ -119,6 +119,7 @@ excludedClassesCoverage += [ "datadog.trace.api.civisibility.telemetry.CiVisibilityDistributionMetric", "datadog.trace.api.civisibility.telemetry.CiVisibilityMetricData", "datadog.trace.api.civisibility.telemetry.NoOpMetricCollector", + "datadog.trace.api.civisibility.CiVisibilityWellKnownTags", "datadog.trace.api.civisibility.InstrumentationBridge", "datadog.trace.api.civisibility.InstrumentationTestBridge", // POJO diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index 0842b1af76a..4c9eca39428 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -210,9 +210,11 @@ import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_PORT; import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_SOURCE_DATA_ENABLED; import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_TELEMETRY_ENABLED; +import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_TEST_COMMAND; import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_TEST_SKIPPING_ENABLED; import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_TOTAL_FLAKY_RETRY_COUNT; import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_TRACE_SANITATION_ENABLED; +import static datadog.trace.api.config.CiVisibilityConfig.SESSION_NAME; import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_AGENTLESS; import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_AGENTLESS_DEFAULT; import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_TAGS; @@ -494,6 +496,7 @@ import static datadog.trace.util.CollectionUtils.tryMakeImmutableSet; import static datadog.trace.util.Strings.propertyNameToEnvironmentVariableName; +import datadog.trace.api.civisibility.CiVisibilityWellKnownTags; import datadog.trace.api.config.GeneralConfig; import datadog.trace.api.config.ProfilingConfig; import datadog.trace.api.config.TracerConfig; @@ -839,7 +842,9 @@ public static String getHostName() { private final int ciVisibilityTotalFlakyRetryCount; private final boolean ciVisibilityEarlyFlakeDetectionEnabled; private final int ciVisibilityEarlyFlakeDetectionLowerLimit; + private final String ciVisibilitySessionName; private final String ciVisibilityModuleName; + private final String ciVisibilityTestCommand; private final boolean ciVisibilityTelemetryEnabled; private final long ciVisibilityRumFlushWaitMillis; private final boolean ciVisibilityAutoInjected; @@ -1903,7 +1908,9 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) ciVisibilityFlakyRetryCount = configProvider.getInteger(CIVISIBILITY_FLAKY_RETRY_COUNT, 5); ciVisibilityTotalFlakyRetryCount = configProvider.getInteger(CIVISIBILITY_TOTAL_FLAKY_RETRY_COUNT, 1000); + ciVisibilitySessionName = configProvider.getString(SESSION_NAME); ciVisibilityModuleName = configProvider.getString(CIVISIBILITY_MODULE_NAME); + ciVisibilityTestCommand = configProvider.getString(CIVISIBILITY_TEST_COMMAND); ciVisibilityTelemetryEnabled = configProvider.getBoolean(CIVISIBILITY_TELEMETRY_ENABLED, true); ciVisibilityRumFlushWaitMillis = configProvider.getLong(CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS, 500); @@ -3256,10 +3263,18 @@ public int getCiVisibilityTotalFlakyRetryCount() { return ciVisibilityTotalFlakyRetryCount; } + public String getCiVisibilitySessionName() { + return ciVisibilitySessionName; + } + public String getCiVisibilityModuleName() { return ciVisibilityModuleName; } + public String getCiVisibilityTestCommand() { + return ciVisibilityTestCommand; + } + public boolean isCiVisibilityTelemetryEnabled() { return ciVisibilityTelemetryEnabled; } @@ -3705,6 +3720,19 @@ public WellKnownTags getWellKnownTags() { LANGUAGE_TAG_VALUE); } + public CiVisibilityWellKnownTags getCiVisibilityWellKnownTags() { + return new CiVisibilityWellKnownTags( + getRuntimeId(), + getEnv(), + LANGUAGE_TAG_VALUE, + System.getProperty("java.runtime.name"), + System.getProperty("java.version"), + System.getProperty("java.vendor"), + System.getProperty("os.arch"), + System.getProperty("os.name"), + System.getProperty("os.version")); + } + public String getPrimaryTag() { return primaryTag; } diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/CiVisibilityWellKnownTags.java b/internal-api/src/main/java/datadog/trace/api/civisibility/CiVisibilityWellKnownTags.java new file mode 100644 index 00000000000..a5ae623cba2 --- /dev/null +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/CiVisibilityWellKnownTags.java @@ -0,0 +1,73 @@ +package datadog.trace.api.civisibility; + +import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; + +public class CiVisibilityWellKnownTags { + + private final UTF8BytesString runtimeId; + private final UTF8BytesString env; + private final UTF8BytesString language; + private final UTF8BytesString runtimeName; + private final UTF8BytesString runtimeVersion; + private final UTF8BytesString runtimeVendor; + private final UTF8BytesString osArch; + private final UTF8BytesString osPlatform; + private final UTF8BytesString osVersion; + + public CiVisibilityWellKnownTags( + CharSequence runtimeId, + CharSequence env, + CharSequence language, + CharSequence runtimeName, + CharSequence runtimeVersion, + CharSequence runtimeVendor, + CharSequence osArch, + CharSequence osPlatform, + CharSequence osVersion) { + this.runtimeId = UTF8BytesString.create(runtimeId); + this.env = UTF8BytesString.create(env); + this.language = UTF8BytesString.create(language); + this.runtimeName = UTF8BytesString.create(runtimeName); + this.runtimeVersion = UTF8BytesString.create(runtimeVersion); + this.runtimeVendor = UTF8BytesString.create(runtimeVendor); + this.osArch = UTF8BytesString.create(osArch); + this.osPlatform = UTF8BytesString.create(osPlatform); + this.osVersion = UTF8BytesString.create(osVersion); + } + + public UTF8BytesString getEnv() { + return env; + } + + public UTF8BytesString getLanguage() { + return language; + } + + public UTF8BytesString getOsArch() { + return osArch; + } + + public UTF8BytesString getOsPlatform() { + return osPlatform; + } + + public UTF8BytesString getOsVersion() { + return osVersion; + } + + public UTF8BytesString getRuntimeId() { + return runtimeId; + } + + public UTF8BytesString getRuntimeName() { + return runtimeName; + } + + public UTF8BytesString getRuntimeVersion() { + return runtimeVersion; + } + + public UTF8BytesString getRuntimeVendor() { + return runtimeVendor; + } +} diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java index 489417e8a41..a314908cfe3 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java @@ -48,6 +48,7 @@ public class Tags { public static final String DB_SCHEMA = "db.schema"; public static final String MESSAGE_BUS_DESTINATION = "message_bus.destination"; + public static final String TEST_SESSION_NAME = "test_session.name"; public static final String TEST_MODULE = "test.module"; public static final String TEST_SUITE = "test.suite"; public static final String TEST_NAME = "test.name";