From 04348ff5b62657670d04343a6c896e07f99e3a73 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Thu, 3 Oct 2024 16:16:24 +0200 Subject: [PATCH] Trace Maven and Gradle build tasks --- .../domain/BuildSystemSession.java | 3 + .../buildsystem/BuildSystemSessionImpl.java | 7 + .../events/BuildEventsHandlerImpl.java | 59 ++- .../events/BuildTaskDescriptor.java | 31 ++ .../events/TestModuleDescriptor.java | 31 -- .../gradle/legacy/GradleBuildListener.java | 24 +- .../gradle/CiVisibilityGradleListener.java | 10 +- .../gradle/CiVisibilityService.java | 11 + .../maven3/MavenExecutionListener.java | 59 ++- .../events.ftl | 115 ++++- .../events.ftl | 1 + .../events.ftl | 115 ++++- .../events.ftl | 1 + .../events.ftl | 115 ++++- .../events.ftl | 259 +++++++++- .../events.ftl | 259 +++++++++- .../events.ftl | 163 +++++- .../events.ftl | 25 +- .../events.ftl | 25 +- .../test-failed-flaky-retries/events.ftl | 364 +++++++++---- .../events.ftl | 270 ++++++++-- .../events.ftl | 264 ++++++++-- .../events.ftl | 203 +++++++- .../test-skip-new-instrumentation/events.ftl | 199 +++++++- .../test-succeed-junit-5/coverages.ftl | 2 +- .../resources/test-succeed-junit-5/events.ftl | 289 ++++++++--- .../coverages.ftl | 2 +- .../events.ftl | 295 ++++++++--- .../coverages.ftl | 24 +- .../events.ftl | 324 +++++++++--- .../coverages.ftl | 4 +- .../events.ftl | 318 +++++++++--- .../events.ftl | 481 +++++++++++++++--- .../events.ftl | 481 +++++++++++++++--- .../coverages.ftl | 2 +- .../events.ftl | 289 ++++++++--- .../test-succeed-old-gradle/coverages.ftl | 2 +- .../test-succeed-old-gradle/events.ftl | 295 ++++++++--- .../coverages.ftl | 10 +- .../events.ftl | 361 +++++++++---- .../test_successful_maven_run/coverages.ftl | 2 +- .../test_successful_maven_run/events.ftl | 276 +++++++--- .../coverages.ftl | 2 +- .../events.ftl | 255 +++++++--- .../events.ftl | 291 +++++++++-- .../coverages.ftl | 2 +- .../events.ftl | 276 +++++++--- .../coverages.ftl | 2 +- .../events.ftl | 276 +++++++--- .../coverages.ftl | 2 +- .../events.ftl | 221 ++++++-- .../events.ftl | 299 ++++++++--- .../coverages.ftl | 2 +- .../events.ftl | 276 +++++++--- .../events/BuildEventsHandler.java | 6 + 55 files changed, 6542 insertions(+), 1438 deletions(-) create mode 100644 dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildTaskDescriptor.java delete mode 100644 dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestModuleDescriptor.java diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/BuildSystemSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/BuildSystemSession.java index 0e6d0839fe5a..9766b25998d9 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/BuildSystemSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/BuildSystemSession.java @@ -3,6 +3,7 @@ import datadog.trace.api.civisibility.domain.BuildModuleLayout; import datadog.trace.api.civisibility.domain.BuildSessionSettings; import datadog.trace.api.civisibility.domain.JavaAgent; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.civisibility.config.JvmInfo; import java.nio.file.Path; import java.util.Collection; @@ -25,6 +26,8 @@ BuildSystemModule testModuleStart( @Nullable Collection classpath, @Nullable JavaAgent jacocoAgent); + AgentSpan testTaskStart(String taskName); + BuildSessionSettings getSettings(); interface Factory { diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java index 5712831cf2ae..41c3bc3c7593 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java @@ -1,5 +1,7 @@ package datadog.trace.civisibility.domain.buildsystem; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; + import datadog.trace.api.Config; import datadog.trace.api.DDTags; import datadog.trace.api.civisibility.CIConstants; @@ -202,6 +204,11 @@ public BuildSystemModuleImpl testModuleStart( this::onModuleFinish); } + @Override + public AgentSpan testTaskStart(String taskName) { + return startSpan("ci_visibility", taskName, span.context()); + } + private void onModuleFinish(AgentSpan moduleSpan) { // multiple modules can finish in parallel synchronized (tagPropagationLock) { diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildEventsHandlerImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildEventsHandlerImpl.java index 638fa326b4fc..705002bedbbe 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildEventsHandlerImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildEventsHandlerImpl.java @@ -5,6 +5,7 @@ import datadog.trace.api.civisibility.domain.BuildSessionSettings; import datadog.trace.api.civisibility.domain.JavaAgent; import datadog.trace.api.civisibility.events.BuildEventsHandler; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.civisibility.config.JvmInfo; import datadog.trace.civisibility.config.JvmInfoFactory; @@ -23,7 +24,10 @@ public class BuildEventsHandlerImpl implements BuildEventsHandler inProgressTestSessions = new ConcurrentHashMap<>(); - private final ConcurrentMap, BuildSystemModule> + private final ConcurrentMap, AgentSpan> inProgressBuildTasks = + new ConcurrentHashMap<>(); + + private final ConcurrentMap, BuildSystemModule> inProgressTestModules = new ConcurrentHashMap<>(); private final BuildSystemSession.Factory sessionFactory; @@ -79,6 +83,47 @@ public void onTestSessionFinish(final SessionKey sessionKey) { testSession.end(null); } + @Override + public void onBuildTaskStart( + SessionKey sessionKey, String taskName, Map additionalTags) { + BuildSystemSession testSession = inProgressTestSessions.get(sessionKey); + if (testSession == null) { + throw new IllegalStateException("Could not find session span for key: " + sessionKey); + } + AgentSpan buildTask = testSession.testTaskStart(taskName); + for (Map.Entry e : additionalTags.entrySet()) { + buildTask.setTag(e.getKey(), e.getValue()); + } + inProgressBuildTasks.put(new BuildTaskDescriptor<>(sessionKey, taskName), buildTask); + } + + @Override + public void onBuildTaskFail(SessionKey sessionKey, String taskName, Throwable throwable) { + AgentSpan buildTask = inProgressBuildTasks.get(new BuildTaskDescriptor<>(sessionKey, taskName)); + if (buildTask == null) { + throw new IllegalStateException( + "Could not find build task span for session key " + + sessionKey + + " and task name " + + taskName); + } + buildTask.setError(true); + buildTask.addThrowable(throwable); + } + + @Override + public void onBuildTaskFinish(SessionKey sessionKey, String taskName) { + AgentSpan buildTask = inProgressBuildTasks.get(new BuildTaskDescriptor<>(sessionKey, taskName)); + if (buildTask == null) { + throw new IllegalStateException( + "Could not find build task span for session key " + + sessionKey + + " and task name " + + taskName); + } + buildTask.finish(); + } + @Override public BuildModuleSettings onTestModuleStart( final SessionKey sessionKey, @@ -104,8 +149,8 @@ public BuildModuleSettings onTestModuleStart( } } - TestModuleDescriptor testModuleDescriptor = - new TestModuleDescriptor<>(sessionKey, moduleName); + BuildTaskDescriptor testModuleDescriptor = + new BuildTaskDescriptor<>(sessionKey, moduleName); inProgressTestModules.put(testModuleDescriptor, testModule); return testModule.getSettings(); @@ -126,8 +171,8 @@ public void onTestModuleFail( } private BuildSystemModule getTestModule(final SessionKey sessionKey, final String moduleName) { - TestModuleDescriptor testModuleDescriptor = - new TestModuleDescriptor<>(sessionKey, moduleName); + BuildTaskDescriptor testModuleDescriptor = + new BuildTaskDescriptor<>(sessionKey, moduleName); BuildSystemModule testModule = inProgressTestModules.get(testModuleDescriptor); if (testModule == null) { throw new IllegalStateException( @@ -138,8 +183,8 @@ private BuildSystemModule getTestModule(final SessionKey sessionKey, final Strin @Override public void onTestModuleFinish(SessionKey sessionKey, String moduleName) { - TestModuleDescriptor testModuleDescriptor = - new TestModuleDescriptor<>(sessionKey, moduleName); + BuildTaskDescriptor testModuleDescriptor = + new BuildTaskDescriptor<>(sessionKey, moduleName); BuildSystemModule testModule = inProgressTestModules.remove(testModuleDescriptor); if (testModule == null) { throw new IllegalStateException( diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildTaskDescriptor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildTaskDescriptor.java new file mode 100644 index 000000000000..648a98a1f12a --- /dev/null +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/BuildTaskDescriptor.java @@ -0,0 +1,31 @@ +package datadog.trace.civisibility.events; + +import java.util.Objects; + +public class BuildTaskDescriptor { + + private final T sessionKey; + private final String taskName; + + public BuildTaskDescriptor(T sessionKey, String taskName) { + this.sessionKey = sessionKey; + this.taskName = taskName; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + BuildTaskDescriptor that = (BuildTaskDescriptor) o; + return sessionKey.equals(that.sessionKey) && taskName.equals(that.taskName); + } + + @Override + public int hashCode() { + return Objects.hash(sessionKey, taskName); + } +} diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestModuleDescriptor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestModuleDescriptor.java deleted file mode 100644 index 88054ba77a7f..000000000000 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestModuleDescriptor.java +++ /dev/null @@ -1,31 +0,0 @@ -package datadog.trace.civisibility.events; - -import java.util.Objects; - -public class TestModuleDescriptor { - - private final T sessionKey; - private final String moduleName; - - public TestModuleDescriptor(T sessionKey, String moduleName) { - this.sessionKey = sessionKey; - this.moduleName = moduleName; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - TestModuleDescriptor that = (TestModuleDescriptor) o; - return sessionKey.equals(that.sessionKey) && moduleName.equals(that.moduleName); - } - - @Override - public int hashCode() { - return Objects.hash(sessionKey, moduleName); - } -} diff --git a/dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java b/dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java index 95e5b55ebd7c..f92a31b345b4 100644 --- a/dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java +++ b/dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java @@ -8,6 +8,7 @@ import datadog.trace.api.civisibility.domain.JavaAgent; import datadog.trace.api.civisibility.events.BuildEventsHandler; import java.nio.file.Path; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; @@ -95,14 +96,15 @@ static final class TestTaskExecutionListener implements TaskExecutionListener { @Override public void beforeExecute(@Nonnull Task task) { - if (!GradleUtils.isTestTask(task)) { - return; - } - Project project = task.getProject(); Gradle gradle = project.getGradle(); String taskPath = task.getPath(); + if (!GradleUtils.isTestTask(task)) { + buildEventsHandler.onBuildTaskStart(gradle, taskPath, Collections.emptyMap()); + return; + } + List sourceSetNames = Config.get().getCiVisibilityJacocoGradleSourceSets(); BuildModuleLayout moduleLayout = GradleUtils.getModuleLayout(project, sourceSetNames); Path jvmExecutable = GradleUtils.getEffectiveExecutable(task); @@ -118,15 +120,19 @@ public void beforeExecute(@Nonnull Task task) { @Override public void afterExecute(@Nonnull Task task, @Nonnull TaskState state) { - if (!GradleUtils.isTestTask(task)) { - return; - } - Project project = task.getProject(); Gradle gradle = project.getGradle(); String taskPath = task.getPath(); - Throwable failure = state.getFailure(); + + if (!GradleUtils.isTestTask(task)) { + if (failure != null) { + buildEventsHandler.onBuildTaskFail(gradle, taskPath, failure); + } + buildEventsHandler.onBuildTaskFinish(gradle, taskPath); + return; + } + if (failure != null) { buildEventsHandler.onTestModuleFail(gradle, taskPath, failure); diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/java/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java b/dd-java-agent/instrumentation/gradle-8.3/src/main/java/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java index aaa2989aff67..8e1987d31908 100644 --- a/dd-java-agent/instrumentation/gradle-8.3/src/main/java/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java +++ b/dd-java-agent/instrumentation/gradle-8.3/src/main/java/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java @@ -173,13 +173,13 @@ public void projectsEvaluated(Gradle gradle) { @SuppressWarnings("unchecked") @Override public void beforeExecute(TaskIdentity taskIdentity) { + String taskPath = taskIdentity.getTaskPath(); if (!Test.class.isAssignableFrom(taskIdentity.getTaskType())) { + ciVisibilityService.onBuildTaskStart(taskPath); return; } String projectPath = taskIdentity.getProjectPath(); - String taskPath = taskIdentity.getTaskPath(); - Project project = gradle.getRootProject().project(projectPath); Test task = (Test) project.getTasks().getByName(taskIdentity.name); @@ -226,12 +226,14 @@ private JavaAgent getJacocoAgent(Test task) { @Override public void afterExecute(TaskIdentity taskIdentity, TaskState state) { + String taskPath = taskIdentity.getTaskPath(); + Throwable failure = state.getFailure(); + if (!Test.class.isAssignableFrom(taskIdentity.getTaskType())) { + ciVisibilityService.onBuildTaskFinish(taskPath, failure); return; } - String taskPath = taskIdentity.getTaskPath(); - Throwable failure = state.getFailure(); String reason = state.getSkipped() || !state.getDidWork() ? state.getSkipMessage() : null; ciVisibilityService.onModuleFinish(taskPath, failure, reason); } diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/java/datadog/trace/instrumentation/gradle/CiVisibilityService.java b/dd-java-agent/instrumentation/gradle-8.3/src/main/java/datadog/trace/instrumentation/gradle/CiVisibilityService.java index b13422bd563a..ff5fe6dd52cd 100644 --- a/dd-java-agent/instrumentation/gradle-8.3/src/main/java/datadog/trace/instrumentation/gradle/CiVisibilityService.java +++ b/dd-java-agent/instrumentation/gradle-8.3/src/main/java/datadog/trace/instrumentation/gradle/CiVisibilityService.java @@ -104,6 +104,17 @@ public void onBuildStart( SESSION_KEY, buildPath, projectRoot, startCommand, "gradle", gradleVersion, additionalTags); } + public void onBuildTaskStart(String taskPath) { + buildEventsHandler.onBuildTaskStart(SESSION_KEY, taskPath, Collections.emptyMap()); + } + + public void onBuildTaskFinish(String taskPath, @Nullable Throwable failure) { + if (failure != null) { + buildEventsHandler.onBuildTaskFail(SESSION_KEY, taskPath, failure); + } + buildEventsHandler.onBuildTaskFinish(SESSION_KEY, taskPath); + } + public void onModuleStart( String taskPath, BuildModuleLayout moduleLayout, diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenExecutionListener.java b/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenExecutionListener.java index f76215fc7fa8..acbc5b6fbb0d 100644 --- a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenExecutionListener.java +++ b/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenExecutionListener.java @@ -9,10 +9,7 @@ import datadog.trace.bootstrap.instrumentation.api.Tags; import java.io.File; import java.nio.file.Path; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; import javax.annotation.Nullable; import org.apache.maven.execution.AbstractExecutionListener; import org.apache.maven.execution.ExecutionEvent; @@ -61,28 +58,29 @@ public void mojoSkipped(ExecutionEvent event) { mojoStarted(event); buildEventsHandler.onTestModuleSkip(request, moduleName, null); mojoSucceeded(event); + } else { + mojoStarted(event); + mojoSucceeded(event); } } @Override public void mojoStarted(ExecutionEvent event) { MojoExecution mojoExecution = event.getMojoExecution(); - if (!MavenUtils.isTestExecution(mojoExecution)) { - return; - } - - String executionId = - mojoExecution.getPlugin().getArtifactId() - + ":" - + mojoExecution.getGoal() - + ":" - + mojoExecution.getExecutionId(); - MavenSession session = event.getSession(); MavenExecutionRequest request = session.getRequest(); MavenProject project = event.getProject(); String moduleName = MavenUtils.getUniqueModuleName(project, mojoExecution); + if (!MavenUtils.isTestExecution(mojoExecution)) { + Map additionalTags = new HashMap<>(); + additionalTags.put("project", project.getName()); + additionalTags.put("plugin", mojoExecution.getArtifactId()); + additionalTags.put("execution", mojoExecution.getExecutionId()); + buildEventsHandler.onBuildTaskStart(request, moduleName, additionalTags); + return; + } + Build build = project.getBuild(); SourceSet classes = getSourceSet(SourceSet.Type.CODE, build.getSourceDirectory(), build.getOutputDirectory()); @@ -93,6 +91,12 @@ public void mojoStarted(ExecutionEvent event) { Path forkedJvmPath = MavenUtils.getForkedJvmPath(session, mojoExecution); List classpath = MavenUtils.getClasspath(session, mojoExecution); + String executionId = + mojoExecution.getPlugin().getArtifactId() + + ":" + + mojoExecution.getGoal() + + ":" + + mojoExecution.getExecutionId(); Map additionalTags = Collections.singletonMap(Tags.TEST_EXECUTION, executionId); JavaAgent jacocoAgent = MavenUtils.getJacocoAgent(session, project, mojoExecution); @@ -131,26 +135,33 @@ private SourceSet getSourceSet(SourceSet.Type type, String source, String output @Override public void mojoSucceeded(ExecutionEvent event) { MojoExecution mojoExecution = event.getMojoExecution(); + MavenSession session = event.getSession(); + MavenExecutionRequest request = session.getRequest(); + MavenProject project = event.getProject(); + String moduleName = MavenUtils.getUniqueModuleName(project, mojoExecution); + if (MavenUtils.isTestExecution(mojoExecution)) { - MavenSession session = event.getSession(); - MavenExecutionRequest request = session.getRequest(); - MavenProject project = event.getProject(); - String moduleName = MavenUtils.getUniqueModuleName(project, mojoExecution); buildEventsHandler.onTestModuleFinish(request, moduleName); + } else { + buildEventsHandler.onBuildTaskFinish(request, moduleName); } } @Override public void mojoFailed(ExecutionEvent event) { MojoExecution mojoExecution = event.getMojoExecution(); + MavenSession session = event.getSession(); + MavenExecutionRequest request = session.getRequest(); + MavenProject project = event.getProject(); + String moduleName = MavenUtils.getUniqueModuleName(project, mojoExecution); + Exception exception = event.getException(); + if (MavenUtils.isTestExecution(mojoExecution)) { - MavenSession session = event.getSession(); - MavenExecutionRequest request = session.getRequest(); - MavenProject project = event.getProject(); - String moduleName = MavenUtils.getUniqueModuleName(project, mojoExecution); - Exception exception = event.getException(); buildEventsHandler.onTestModuleFail(request, moduleName, exception); buildEventsHandler.onTestModuleFinish(request, moduleName); + } else { + buildEventsHandler.onBuildTaskFail(request, moduleName, exception); + buildEventsHandler.onBuildTaskFinish(request, moduleName); } } } 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 7640fe08ebfc..229f39474fc5 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 @@ -10,6 +10,7 @@ "duration" : ${content_duration}, "error" : 1, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 @@ -46,7 +47,9 @@ "start" : ${content_start_2}, "duration" : ${content_duration_2}, "error" : 1, - "metrics" : { }, + "metrics" : { + "_dd.host.vcpu_count" : 10 + }, "meta" : { "test.type" : "test", "test.module" : "Maven Integration Tests Project maven-surefire-plugin default-test", @@ -64,4 +67,114 @@ "test.command" : "mvn -B clean test" } } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_clean_plugin_default_clean", + "resource" : "Maven_Integration_Tests_Project_maven_clean_plugin_default_clean", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-clean", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-clean-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_compile", + "resource" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_compile", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-compile", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_testCompile", + "resource" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testCompile", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_resources", + "resource" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_resources", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-resources", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_testResources", + "resource" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_testResources", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testResources", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } } ] \ No newline at end of file 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 5de81acc87e8..5dc57278e229 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 @@ -10,6 +10,7 @@ "duration" : ${content_duration}, "error" : 1, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 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 180c9143df12..e9c62623f42a 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 @@ -10,6 +10,7 @@ "duration" : ${content_duration}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 @@ -43,7 +44,9 @@ "start" : ${content_start_2}, "duration" : ${content_duration_2}, "error" : 0, - "metrics" : { }, + "metrics" : { + "_dd.host.vcpu_count" : 10 + }, "meta" : { "test.type" : "test", "test.module" : "Maven Integration Tests Project maven-surefire-plugin default-test", @@ -58,4 +61,114 @@ "test.command" : "mvn -B clean test" } } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_clean_plugin_default_clean", + "resource" : "Maven_Integration_Tests_Project_maven_clean_plugin_default_clean", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-clean", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-clean-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_compile", + "resource" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_compile", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-compile", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_testCompile", + "resource" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testCompile", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_resources", + "resource" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_resources", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-resources", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_testResources", + "resource" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_testResources", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testResources", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } } ] \ No newline at end of file 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 d0eeff6f50ec..64741b136c20 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 @@ -10,6 +10,7 @@ "duration" : ${content_duration}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 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 180c9143df12..e9c62623f42a 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 @@ -10,6 +10,7 @@ "duration" : ${content_duration}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 @@ -43,7 +44,9 @@ "start" : ${content_start_2}, "duration" : ${content_duration_2}, "error" : 0, - "metrics" : { }, + "metrics" : { + "_dd.host.vcpu_count" : 10 + }, "meta" : { "test.type" : "test", "test.module" : "Maven Integration Tests Project maven-surefire-plugin default-test", @@ -58,4 +61,114 @@ "test.command" : "mvn -B clean test" } } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_clean_plugin_default_clean", + "resource" : "Maven_Integration_Tests_Project_maven_clean_plugin_default_clean", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-clean", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-clean-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_compile", + "resource" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_compile", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-compile", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_testCompile", + "resource" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testCompile", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_resources", + "resource" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_resources", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-resources", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_testResources", + "resource" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_testResources", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testResources", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } } ] \ No newline at end of file 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 1c5f0d815773..ab4bd6367435 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 @@ -10,6 +10,7 @@ "duration" : ${content_duration}, "error" : 1, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 @@ -34,6 +35,28 @@ "test.command" : "mvn -B clean test" } } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_clean_plugin_default_clean", + "resource" : "Maven_Integration_Tests_Project_maven_clean_plugin_default_clean", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-clean", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-clean-plugin", + "env" : "none" + } + } }, { "type" : "test_module_end", "version" : 1, @@ -43,10 +66,12 @@ "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "maven.test_module", "resource" : "module-a maven-surefire-plugin default-test", - "start" : ${content_start_2}, - "duration" : ${content_duration_2}, + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, "error" : 0, - "metrics" : { }, + "metrics" : { + "_dd.host.vcpu_count" : 10 + }, "meta" : { "test.type" : "test", "test.module" : "module-a maven-surefire-plugin default-test", @@ -70,10 +95,12 @@ "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "maven.test_module", "resource" : "module-b maven-surefire-plugin default-test", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, "error" : 1, - "metrics" : { }, + "metrics" : { + "_dd.host.vcpu_count" : 10 + }, "meta" : { "test.type" : "test", "test.module" : "module-b maven-surefire-plugin default-test", @@ -91,4 +118,224 @@ "test.command" : "mvn -B clean test" } } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_a_maven_clean_plugin_default_clean", + "resource" : "module_a_maven_clean_plugin_default_clean", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-clean", + "project" : "module-a", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-clean-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_a_maven_compiler_plugin_default_compile", + "resource" : "module_a_maven_compiler_plugin_default_compile", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-compile", + "project" : "module-a", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_a_maven_compiler_plugin_default_testCompile", + "resource" : "module_a_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testCompile", + "project" : "module-a", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_a_maven_resources_plugin_default_resources", + "resource" : "module_a_maven_resources_plugin_default_resources", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-resources", + "project" : "module-a", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_a_maven_resources_plugin_default_testResources", + "resource" : "module_a_maven_resources_plugin_default_testResources", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testResources", + "project" : "module-a", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_b_maven_clean_plugin_default_clean", + "resource" : "module_b_maven_clean_plugin_default_clean", + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-clean", + "project" : "module-b", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-clean-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_8}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_b_maven_compiler_plugin_default_compile", + "resource" : "module_b_maven_compiler_plugin_default_compile", + "start" : ${content_start_11}, + "duration" : ${content_duration_11}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-compile", + "project" : "module-b", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_9}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_b_maven_compiler_plugin_default_testCompile", + "resource" : "module_b_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_12}, + "duration" : ${content_duration_12}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testCompile", + "project" : "module-b", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_10}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_b_maven_resources_plugin_default_resources", + "resource" : "module_b_maven_resources_plugin_default_resources", + "start" : ${content_start_13}, + "duration" : ${content_duration_13}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-resources", + "project" : "module-b", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_11}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_b_maven_resources_plugin_default_testResources", + "resource" : "module_b_maven_resources_plugin_default_testResources", + "start" : ${content_start_14}, + "duration" : ${content_duration_14}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testResources", + "project" : "module-b", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } } ] \ No newline at end of file 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 c6342d89e37c..889cd9ad828c 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 @@ -10,6 +10,7 @@ "duration" : ${content_duration}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 @@ -31,6 +32,28 @@ "test.command" : "mvn -B -T4 clean test" } } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_clean_plugin_default_clean", + "resource" : "Maven_Integration_Tests_Project_maven_clean_plugin_default_clean", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-clean", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-clean-plugin", + "env" : "none" + } + } }, { "type" : "test_module_end", "version" : 1, @@ -40,10 +63,12 @@ "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "maven.test_module", "resource" : "module-a maven-surefire-plugin default-test", - "start" : ${content_start_2}, - "duration" : ${content_duration_2}, + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, "error" : 0, - "metrics" : { }, + "metrics" : { + "_dd.host.vcpu_count" : 10 + }, "meta" : { "test.type" : "test", "test.module" : "module-a maven-surefire-plugin default-test", @@ -67,10 +92,12 @@ "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "maven.test_module", "resource" : "module-b maven-surefire-plugin default-test", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, "error" : 0, - "metrics" : { }, + "metrics" : { + "_dd.host.vcpu_count" : 10 + }, "meta" : { "test.type" : "test", "test.module" : "module-b maven-surefire-plugin default-test", @@ -85,4 +112,224 @@ "test.command" : "mvn -B -T4 clean test" } } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_a_maven_clean_plugin_default_clean", + "resource" : "module_a_maven_clean_plugin_default_clean", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-clean", + "project" : "module-a", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-clean-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_a_maven_compiler_plugin_default_compile", + "resource" : "module_a_maven_compiler_plugin_default_compile", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-compile", + "project" : "module-a", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_a_maven_compiler_plugin_default_testCompile", + "resource" : "module_a_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testCompile", + "project" : "module-a", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_a_maven_resources_plugin_default_resources", + "resource" : "module_a_maven_resources_plugin_default_resources", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-resources", + "project" : "module-a", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_a_maven_resources_plugin_default_testResources", + "resource" : "module_a_maven_resources_plugin_default_testResources", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testResources", + "project" : "module-a", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_b_maven_clean_plugin_default_clean", + "resource" : "module_b_maven_clean_plugin_default_clean", + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-clean", + "project" : "module-b", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-clean-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_8}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_b_maven_compiler_plugin_default_compile", + "resource" : "module_b_maven_compiler_plugin_default_compile", + "start" : ${content_start_11}, + "duration" : ${content_duration_11}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-compile", + "project" : "module-b", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_9}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_b_maven_compiler_plugin_default_testCompile", + "resource" : "module_b_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_12}, + "duration" : ${content_duration_12}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testCompile", + "project" : "module-b", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_10}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_b_maven_resources_plugin_default_resources", + "resource" : "module_b_maven_resources_plugin_default_resources", + "start" : ${content_start_13}, + "duration" : ${content_duration_13}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-resources", + "project" : "module-b", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_11}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "module_b_maven_resources_plugin_default_testResources", + "resource" : "module_b_maven_resources_plugin_default_testResources", + "start" : ${content_start_14}, + "duration" : ${content_duration_14}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testResources", + "project" : "module-b", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } } ] \ No newline at end of file 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 499be5055d60..2ce7b1592dda 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 @@ -10,6 +10,7 @@ "duration" : ${content_duration}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 @@ -43,7 +44,9 @@ "start" : ${content_start_2}, "duration" : ${content_duration_2}, "error" : 0, - "metrics" : { }, + "metrics" : { + "_dd.host.vcpu_count" : 10 + }, "meta" : { "test.type" : "test", "test.module" : "Maven Integration Tests Project maven-failsafe-plugin default", @@ -70,7 +73,9 @@ "start" : ${content_start_3}, "duration" : ${content_duration_3}, "error" : 0, - "metrics" : { }, + "metrics" : { + "_dd.host.vcpu_count" : 10 + }, "meta" : { "test.type" : "test", "test.module" : "Maven Integration Tests Project maven-surefire-plugin default-test", @@ -85,4 +90,158 @@ "test.command" : "mvn -B verify" } } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_build_helper_maven_plugin_add_test_source", + "resource" : "Maven_Integration_Tests_Project_build_helper_maven_plugin_add_test_source", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "add-test-source", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "build-helper-maven-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_compile", + "resource" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_compile", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-compile", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_testCompile", + "resource" : "Maven_Integration_Tests_Project_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testCompile", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-compiler-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_failsafe_plugin_default", + "resource" : "Maven_Integration_Tests_Project_maven_failsafe_plugin_default", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-failsafe-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_jar_plugin_default_jar", + "resource" : "Maven_Integration_Tests_Project_maven_jar_plugin_default_jar", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-jar", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-jar-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_resources", + "resource" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_resources", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-resources", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_testResources", + "resource" : "Maven_Integration_Tests_Project_maven_resources_plugin_default_testResources", + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, + "error" : 0, + "metrics" : { }, + "meta" : { + "execution" : "default-testResources", + "project" : "Maven Integration Tests Project", + "library_version" : ${content_meta_library_version}, + "plugin" : "maven-resources-plugin", + "env" : "none" + } + } } ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-corrupted-config-legacy-instrumentation/events.ftl index dfa139a7d4ca..02272eb5ba58 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 @@ -10,34 +10,35 @@ "duration" : ${content_duration}, "error" : 1, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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", - "test_session.name" : "gradle test", "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "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}, - "test.command" : "gradle test" + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "gradle test", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file 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 622326206a1f..da59092c4f6e 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 @@ -10,34 +10,35 @@ "duration" : ${content_duration}, "error" : 1, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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", - "test_session.name" : "gradle test", "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "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}, - "test.command" : "gradle test" + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "gradle test", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file 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 b48693eb598f..00037b4e3487 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 @@ -14,28 +14,23 @@ "test.itr.tests_skipping.count" : 0, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 0 }, "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", - "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.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", "error.type" : "org.gradle.internal.exceptions.LocationAwareException", @@ -45,7 +40,13 @@ "error.stack" : ${content_meta_error_stack}, "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -61,38 +62,123 @@ "duration" : ${content_duration_2}, "error" : 1, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 0, "test.code_coverage.lines_pct" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : ":test", "test.status" : "fail", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "gradle", "error.type" : "org.gradle.api.tasks.TaskExecutionException", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "error.message" : ${content_meta_error_message}, "error.stack" : ${content_meta_error_stack_2}, "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.10", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "classes", + "resource" : "classes", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileJava", + "resource" : "compileJava", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileTestJava", + "resource" : "compileTestJava", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -105,38 +191,39 @@ "service" : "test-gradle-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestFailed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.module" : ":test", "test.status" : "fail", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestFailed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -144,27 +231,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestFailed.test_failed", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, "error" : 1, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", @@ -172,24 +259,25 @@ "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_failed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestFailed", - "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", "error.type" : "java.lang.AssertionError", "error.stack" : ${content_meta_error_stack_3}, "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -197,27 +285,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestFailed.test_failed", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 1, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", @@ -225,25 +313,26 @@ "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_failed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestFailed", - "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_4}, "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -251,27 +340,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_3}, - "span_id" : ${content_span_id_3}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestFailed.test_failed", - "start" : ${content_start_6}, - "duration" : ${content_duration_6}, + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, "error" : 1, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_6}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", @@ -279,25 +368,26 @@ "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_failed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestFailed", - "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_5}, "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -305,27 +395,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_4}, - "span_id" : ${content_span_id_4}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestFailed.test_failed", - "start" : ${content_start_7}, - "duration" : ${content_duration_7}, + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, "error" : 1, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_7}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", @@ -333,25 +423,26 @@ "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_failed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestFailed", - "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_6}, "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -359,27 +450,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_5}, - "span_id" : ${content_span_id_5}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_8}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestFailed.test_failed", - "start" : ${content_start_8}, - "duration" : ${content_duration_8}, + "start" : ${content_start_11}, + "duration" : ${content_duration_11}, "error" : 1, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_8}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_11}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", @@ -387,25 +478,110 @@ "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_failed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestFailed", - "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_7}, "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_9}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processResources", + "resource" : "processResources", + "start" : ${content_start_12}, + "duration" : ${content_duration_12}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_12}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_10}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processTestResources", + "resource" : "processTestResources", + "start" : ${content_start_13}, + "duration" : ${content_duration_13}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_13}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_11}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "testClasses", + "resource" : "testClasses", + "start" : ${content_start_14}, + "duration" : ${content_duration_14}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_14}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file 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 3f5f80ff5dcf..51170d522270 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 @@ -11,38 +11,123 @@ "duration" : ${content_duration}, "error" : 1, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 0, "test.code_coverage.lines_pct" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : ":test", "test.status" : "fail", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "gradle", "error.type" : "org.gradle.api.tasks.TaskExecutionException", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "error.message" : ${content_meta_error_message}, "error.stack" : ${content_meta_error_stack}, "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.10", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "classes", + "resource" : "classes", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileJava", + "resource" : "compileJava", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileTestJava", + "resource" : "compileTestJava", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -55,38 +140,39 @@ "service" : "test-gradle-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestFailed", - "start" : ${content_start_2}, - "duration" : ${content_duration_2}, + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.module" : ":test", "test.status" : "fail", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestFailed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -94,27 +180,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestFailed.test_failed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, "error" : 1, "metrics" : { "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", @@ -122,24 +208,25 @@ "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_failed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestFailed", - "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", "error.type" : "java.lang.AssertionError", "error.stack" : ${content_meta_error_stack_2}, "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -150,36 +237,31 @@ "service" : "test-gradle-service", "name" : "gradle.test_session", "resource" : "gradle-instrumentation-test-project", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, "error" : 1, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "test.itr.tests_skipping.count" : 0, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_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}, - "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.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", "error.type" : "org.gradle.internal.exceptions.LocationAwareException", @@ -189,7 +271,97 @@ "error.stack" : ${content_meta_error_stack_3}, "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processResources", + "resource" : "processResources", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processTestResources", + "resource" : "processTestResources", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "testClasses", + "resource" : "testClasses", + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file 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 141c5e5507d8..81a7cfa5f60e 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 @@ -14,28 +14,23 @@ "test.itr.tests_skipping.count" : 0, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 0 }, "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", - "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.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", "error.type" : "org.gradle.internal.exceptions.LocationAwareException", @@ -45,7 +40,13 @@ "error.stack" : ${content_meta_error_stack}, "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -61,38 +62,123 @@ "duration" : ${content_duration_2}, "error" : 1, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 0, "test.code_coverage.lines_pct" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : ":test", "test.status" : "fail", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "gradle", "error.type" : "org.gradle.api.tasks.TaskExecutionException", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "error.message" : ${content_meta_error_message}, "error.stack" : ${content_meta_error_stack_2}, "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.10", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "classes", + "resource" : "classes", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileJava", + "resource" : "compileJava", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileTestJava", + "resource" : "compileTestJava", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -105,38 +191,39 @@ "service" : "test-gradle-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestFailed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.module" : ":test", "test.status" : "fail", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestFailed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -144,27 +231,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestFailed.test_failed", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, "error" : 1, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", @@ -172,24 +259,109 @@ "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_failed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestFailed", - "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", "error.type" : "java.lang.AssertionError", "error.stack" : ${content_meta_error_stack_3}, "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processResources", + "resource" : "processResources", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processTestResources", + "resource" : "processTestResources", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "testClasses", + "resource" : "testClasses", + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file 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 ec077dce2245..960260b51f32 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 @@ -10,28 +10,114 @@ "start" : ${content_start}, "duration" : ${content_duration}, "error" : 0, - "metrics" : { }, + "metrics" : { + "_dd.host.vcpu_count" : 10 + }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : ":test", "test.status" : "skip", "test.skip_reason" : "NO-SOURCE", "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, + "env" : "integration-test", + "library_version" : ${content_meta_library_version}, + "component" : "gradle", + "span.kind" : "test_module_end", + "test.command" : "gradle test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "classes", + "resource" : "classes", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "library_version" : ${content_meta_library_version}, "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileJava", + "resource" : "compileJava", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "library_version" : ${content_meta_library_version}, - "component" : "gradle", - "span.kind" : "test_module_end", + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, - "test.command" : "gradle test", + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileTestJava", + "resource" : "compileTestJava", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -42,35 +128,120 @@ "service" : "test-gradle-service", "name" : "gradle.test_session", "resource" : "gradle-instrumentation-test-project", - "start" : ${content_start_2}, - "duration" : ${content_duration_2}, + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "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}, "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}, "component" : "gradle", "test.toolchain" : ${content_meta_test_toolchain}, "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "gradle test", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processResources", + "resource" : "processResources", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", "runtime-id" : ${content_meta_runtime_id}, - "test.command" : "gradle test" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processTestResources", + "resource" : "processTestResources", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "testClasses", + "resource" : "testClasses", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file 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 5449faab9e43..fd0aa513471a 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 @@ -10,6 +10,7 @@ "duration" : ${content_duration}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 @@ -17,24 +18,24 @@ "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" : "skip", "test_session.name" : "gradle test", "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}, "component" : "gradle", "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" : "gradle test" + "test.command" : "gradle test", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -49,28 +50,198 @@ "start" : ${content_start_2}, "duration" : ${content_duration_2}, "error" : 0, - "metrics" : { }, + "metrics" : { + "_dd.host.vcpu_count" : 10 + }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "test.type" : "test", - "os.architecture" : ${content_meta_os_architecture}, "test.module" : ":test", "test.status" : "skip", "test.skip_reason" : "NO-SOURCE", "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, + "env" : "integration-test", + "library_version" : ${content_meta_library_version}, + "component" : "gradle", + "span.kind" : "test_module_end", + "test.command" : "gradle test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "classes", + "resource" : "classes", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "library_version" : ${content_meta_library_version}, "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileJava", + "resource" : "compileJava", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "library_version" : ${content_meta_library_version}, - "component" : "gradle", - "span.kind" : "test_module_end", + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, - "test.command" : "gradle test", + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileTestJava", + "resource" : "compileTestJava", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processResources", + "resource" : "processResources", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processTestResources", + "resource" : "processTestResources", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "testClasses", + "resource" : "testClasses", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/coverages.ftl index b6b94b8bcd4c..7fd3cc4c6e51 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/coverages.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/coverages.ftl @@ -1,7 +1,7 @@ [ { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id}, + "span_id" : ${content_span_id_4}, "files" : [ { "filename" : "src/test/java/datadog/smoke/TestSucceed.java", "bitmap" : "ABg=" 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 3ec5a1d934ee..e4914c3b2846 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 @@ -14,36 +14,37 @@ "test.itr.tests_skipping.count" : 1, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 50 }, "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}, "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.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", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "5.9.3", - "test.framework" : "junit5" + "test.framework" : "junit5", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -59,36 +60,121 @@ "duration" : ${content_duration_2}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 1, "test.code_coverage.lines_pct" : 50 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : ":test", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "gradle", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "5.9.3", "test.framework" : "junit5", + "test.itr.tests_skipping.enabled" : "true", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "classes", + "resource" : "classes", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileJava", + "resource" : "compileJava", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileTestJava", + "resource" : "compileTestJava", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -101,38 +187,39 @@ "service" : "test-gradle-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":test", "test.status" : "pass", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "5.9.3", - "test.framework" : "junit5" + "test.framework" : "junit5", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -140,27 +227,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_succeed", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", @@ -168,22 +255,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "5.9.3", - "test.framework" : "junit5" + "test.framework" : "junit5", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -191,27 +279,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 17, "test.source.start" : 14 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_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", @@ -219,24 +307,109 @@ "test.status" : "skip", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_to_skip_with_itr", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "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", "test.skipped_by_itr" : "true", "test.framework_version" : "5.9.3", - "test.framework" : "junit5" + "test.framework" : "junit5", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processResources", + "resource" : "processResources", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processTestResources", + "resource" : "processTestResources", + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_8}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "testClasses", + "resource" : "testClasses", + "start" : ${content_start_11}, + "duration" : ${content_duration_11}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/coverages.ftl index b6b94b8bcd4c..7fd3cc4c6e51 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/coverages.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/coverages.ftl @@ -1,7 +1,7 @@ [ { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id}, + "span_id" : ${content_span_id_4}, "files" : [ { "filename" : "src/test/java/datadog/smoke/TestSucceed.java", "bitmap" : "ABg=" 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 694a37dee940..6e8b72d3c110 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 @@ -11,36 +11,121 @@ "duration" : ${content_duration}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 1, "test.code_coverage.lines_pct" : 50 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : ":test", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "gradle", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.10", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "classes", + "resource" : "classes", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileJava", + "resource" : "compileJava", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileTestJava", + "resource" : "compileTestJava", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -53,38 +138,39 @@ "service" : "test-gradle-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceed", - "start" : ${content_start_2}, - "duration" : ${content_duration_2}, + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":test", "test.status" : "pass", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -92,27 +178,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_succeed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "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, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", @@ -120,22 +206,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -143,27 +230,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 17, "test.source.start" : 14 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_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", @@ -171,24 +258,25 @@ "test.status" : "skip", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_to_skip_with_itr", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "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", "test.skipped_by_itr" : "true", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -199,44 +287,129 @@ "service" : "test-gradle-service", "name" : "gradle.test_session", "resource" : "gradle-instrumentation-test-project", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "test.itr.tests_skipping.count" : 1, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 50 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_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}, "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.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", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processResources", + "resource" : "processResources", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processTestResources", + "resource" : "processTestResources", + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_8}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "testClasses", + "resource" : "testClasses", + "start" : ${content_start_11}, + "duration" : ${content_duration_11}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ 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 2a80c0112f73..6108551983da 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,18 +1,7 @@ [ { - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id_2}, - "span_id" : ${content_span_id_2}, - "files" : [ { - "filename" : "src/main/java/datadog/smoke/Calculator.java", - "bitmap" : "AAE=" - }, { - "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}, + "span_id" : ${content_span_id_4}, "files" : [ { "filename" : "src/test/java/datadog/smoke/TestSucceed.java", "bitmap" : "gAw=" @@ -20,4 +9,15 @@ "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_5}, + "files" : [ { + "filename" : "src/main/java/datadog/smoke/Calculator.java", + "bitmap" : "AAE=" + }, { + "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-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl index 92da3d3a64c1..ce92b949840c 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 @@ -11,35 +11,120 @@ "duration" : ${content_duration}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 0, "test.code_coverage.lines_pct" : 67 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : ":test", "test.status" : "pass", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "gradle", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", + "test.code_coverage.backfilled" : "true", "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" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "classes", + "resource" : "classes", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileJava", + "resource" : "compileJava", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileTestJava", + "resource" : "compileTestJava", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -52,38 +137,39 @@ "service" : "test-gradle-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceed", - "start" : ${content_start_2}, - "duration" : ${content_duration_2}, + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":test", "test.status" : "pass", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -91,27 +177,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_succeed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "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, + "_dd.host.vcpu_count" : 10, "test.source.end" : 11, "test.source.start" : 8 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", @@ -119,22 +205,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -147,38 +234,39 @@ "service" : "test-gradle-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceedJunit5", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java", "test.module" : ":test", "test.status" : "pass", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceedJunit5", - "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", "test.framework_version" : "5.9.3", - "test.framework" : "junit5" + "test.framework" : "junit5", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -186,27 +274,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id_2}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceedJunit5.test_succeed", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 11, "test.source.start" : 8 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java", "test.source.method" : "test_succeed()V", @@ -214,22 +302,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceedJunit5", - "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", "test.framework_version" : "5.9.3", - "test.framework" : "junit5" + "test.framework" : "junit5", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -240,43 +329,128 @@ "service" : "test-gradle-service", "name" : "gradle.test_session", "resource" : "gradle-instrumentation-test-project", - "start" : ${content_start_6}, - "duration" : ${content_duration_6}, + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_3}, "test.itr.tests_skipping.count" : 0, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 67 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_6}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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.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", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "[\"4.13.2\",\"5.9.3\"]", - "test.framework" : "[\"junit4\",\"junit5\"]" + "test.framework" : "[\"junit4\",\"junit5\"]", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processResources", + "resource" : "processResources", + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processTestResources", + "resource" : "processTestResources", + "start" : ${content_start_11}, + "duration" : ${content_duration_11}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_8}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "testClasses", + "resource" : "testClasses", + "start" : ${content_start_12}, + "duration" : ${content_duration_12}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_12}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ 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 539be8b8b548..6108551983da 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 @@ -1,7 +1,7 @@ [ { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id}, + "span_id" : ${content_span_id_4}, "files" : [ { "filename" : "src/test/java/datadog/smoke/TestSucceed.java", "bitmap" : "gAw=" @@ -12,7 +12,7 @@ }, { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id_2}, - "span_id" : ${content_span_id_2}, + "span_id" : ${content_span_id_5}, "files" : [ { "filename" : "src/main/java/datadog/smoke/Calculator.java", "bitmap" : "AAE=" 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 f405ecdd4027..9830372ba036 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 @@ -14,35 +14,36 @@ "test.itr.tests_skipping.count" : 0, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 67 }, "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", - "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.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", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "[\"4.13.2\",\"5.9.3\"]", - "test.framework" : "[\"junit4\",\"junit5\"]" + "test.framework" : "[\"junit4\",\"junit5\"]", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -58,35 +59,120 @@ "duration" : ${content_duration_2}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 0, "test.code_coverage.lines_pct" : 67 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : ":test", "test.status" : "pass", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "gradle", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", + "test.code_coverage.backfilled" : "true", "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", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "classes", + "resource" : "classes", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileJava", + "resource" : "compileJava", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileTestJava", + "resource" : "compileTestJava", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -99,38 +185,39 @@ "service" : "test-gradle-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":test", "test.status" : "pass", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -138,27 +225,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_succeed", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 11, "test.source.start" : 8 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", @@ -166,22 +253,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -194,38 +282,39 @@ "service" : "test-gradle-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceedJunit5", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_3}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java", "test.module" : ":test", "test.status" : "pass", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceedJunit5", - "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", "test.framework_version" : "5.9.3", - "test.framework" : "junit5" + "test.framework" : "junit5", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -233,27 +322,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id_2}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceedJunit5.test_succeed", - "start" : ${content_start_6}, - "duration" : ${content_duration_6}, + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_3}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 11, "test.source.start" : 8 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_6}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java", "test.source.method" : "test_succeed()V", @@ -261,22 +350,107 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceedJunit5", - "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", "test.framework_version" : "5.9.3", - "test.framework" : "junit5" + "test.framework" : "junit5", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processResources", + "resource" : "processResources", + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processTestResources", + "resource" : "processTestResources", + "start" : ${content_start_11}, + "duration" : ${content_duration_11}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_8}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "testClasses", + "resource" : "testClasses", + "start" : ${content_start_12}, + "duration" : ${content_duration_12}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_12}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ 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 f56fb1a23046..389d4e814aec 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 @@ -11,35 +11,36 @@ "duration" : ${content_duration}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 0, "test.code_coverage.lines_pct" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : ":submodule-a:test", "test.status" : "pass", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "gradle", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.10", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -55,35 +56,36 @@ "duration" : ${content_duration_2}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 0, "test.code_coverage.lines_pct" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : ":submodule-b:test", "test.status" : "pass", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "gradle", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.10", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -100,34 +102,35 @@ "duration" : ${content_duration_3}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "_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", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -144,34 +147,35 @@ "duration" : ${content_duration_4}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "_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", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -194,12 +198,12 @@ "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "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", @@ -207,22 +211,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -245,12 +250,12 @@ "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "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", @@ -258,22 +263,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -292,35 +298,372 @@ "test.itr.tests_skipping.count" : 0, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 0 }, "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", - "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.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", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_a_classes", + "resource" : "submodule_a_classes", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_a_compileJava", + "resource" : "submodule_a_compileJava", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_a_compileTestJava", + "resource" : "submodule_a_compileTestJava", + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_a_processResources", + "resource" : "submodule_a_processResources", + "start" : ${content_start_11}, + "duration" : ${content_duration_11}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_a_processTestResources", + "resource" : "submodule_a_processTestResources", + "start" : ${content_start_12}, + "duration" : ${content_duration_12}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_12}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_8}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_a_testClasses", + "resource" : "submodule_a_testClasses", + "start" : ${content_start_13}, + "duration" : ${content_duration_13}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_13}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_9}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_b_classes", + "resource" : "submodule_b_classes", + "start" : ${content_start_14}, + "duration" : ${content_duration_14}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_14}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_10}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_b_compileJava", + "resource" : "submodule_b_compileJava", + "start" : ${content_start_15}, + "duration" : ${content_duration_15}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_15}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_11}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_b_compileTestJava", + "resource" : "submodule_b_compileTestJava", + "start" : ${content_start_16}, + "duration" : ${content_duration_16}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_16}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_12}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_b_processResources", + "resource" : "submodule_b_processResources", + "start" : ${content_start_17}, + "duration" : ${content_duration_17}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_17}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_13}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_b_processTestResources", + "resource" : "submodule_b_processTestResources", + "start" : ${content_start_18}, + "duration" : ${content_duration_18}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_18}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_14}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_b_testClasses", + "resource" : "submodule_b_testClasses", + "start" : ${content_start_19}, + "duration" : ${content_duration_19}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_19}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file 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 c2da21bb3605..97dd86597a9b 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 @@ -14,35 +14,36 @@ "test.itr.tests_skipping.count" : 0, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 0 }, "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", - "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.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", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -58,35 +59,36 @@ "duration" : ${content_duration_2}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 0, "test.code_coverage.lines_pct" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : ":submodule-a:test", "test.status" : "pass", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "gradle", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.10", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -102,35 +104,36 @@ "duration" : ${content_duration_3}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 0, "test.code_coverage.lines_pct" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : ":submodule-b:test", "test.status" : "pass", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "gradle", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.10", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -147,34 +150,35 @@ "duration" : ${content_duration_4}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "_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", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -191,34 +195,35 @@ "duration" : ${content_duration_5}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_3}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "_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", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -241,12 +246,12 @@ "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "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", @@ -254,22 +259,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -292,12 +298,12 @@ "process_id" : ${content_metrics_process_id_3}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "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", @@ -305,22 +311,359 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_a_classes", + "resource" : "submodule_a_classes", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_a_compileJava", + "resource" : "submodule_a_compileJava", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_a_compileTestJava", + "resource" : "submodule_a_compileTestJava", + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_a_processResources", + "resource" : "submodule_a_processResources", + "start" : ${content_start_11}, + "duration" : ${content_duration_11}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_a_processTestResources", + "resource" : "submodule_a_processTestResources", + "start" : ${content_start_12}, + "duration" : ${content_duration_12}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_12}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_8}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_a_testClasses", + "resource" : "submodule_a_testClasses", + "start" : ${content_start_13}, + "duration" : ${content_duration_13}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_13}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_9}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_b_classes", + "resource" : "submodule_b_classes", + "start" : ${content_start_14}, + "duration" : ${content_duration_14}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_14}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_10}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_b_compileJava", + "resource" : "submodule_b_compileJava", + "start" : ${content_start_15}, + "duration" : ${content_duration_15}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_15}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_11}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_b_compileTestJava", + "resource" : "submodule_b_compileTestJava", + "start" : ${content_start_16}, + "duration" : ${content_duration_16}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_16}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_12}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_b_processResources", + "resource" : "submodule_b_processResources", + "start" : ${content_start_17}, + "duration" : ${content_duration_17}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_17}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_13}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_b_processTestResources", + "resource" : "submodule_b_processTestResources", + "start" : ${content_start_18}, + "duration" : ${content_duration_18}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_18}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_14}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-gradle-service", + "name" : "submodule_b_testClasses", + "resource" : "submodule_b_testClasses", + "start" : ${content_start_19}, + "duration" : ${content_duration_19}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_19}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/coverages.ftl index b6b94b8bcd4c..7fd3cc4c6e51 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/coverages.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/coverages.ftl @@ -1,7 +1,7 @@ [ { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id}, + "span_id" : ${content_span_id_4}, "files" : [ { "filename" : "src/test/java/datadog/smoke/TestSucceed.java", "bitmap" : "ABg=" 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 ca6e00d6f4db..33504cff9d41 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 @@ -14,36 +14,37 @@ "test.itr.tests_skipping.count" : 1, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 50 }, "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}, "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.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", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -59,36 +60,121 @@ "duration" : ${content_duration_2}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 1, "test.code_coverage.lines_pct" : 50 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : ":test", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "gradle", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.10", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "classes", + "resource" : "classes", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileJava", + "resource" : "compileJava", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileTestJava", + "resource" : "compileTestJava", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -101,38 +187,39 @@ "service" : "test-gradle-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":test", "test.status" : "pass", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -140,27 +227,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_succeed", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", @@ -168,22 +255,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -191,27 +279,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 17, "test.source.start" : 14 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_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", @@ -219,24 +307,109 @@ "test.status" : "skip", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_to_skip_with_itr", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "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", "test.skipped_by_itr" : "true", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processResources", + "resource" : "processResources", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processTestResources", + "resource" : "processTestResources", + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_8}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "testClasses", + "resource" : "testClasses", + "start" : ${content_start_11}, + "duration" : ${content_duration_11}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/coverages.ftl index 640a61a0db83..8a915a940a5c 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/coverages.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/coverages.ftl @@ -1,7 +1,7 @@ [ { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id}, + "span_id" : ${content_span_id_4}, "files" : [ { "filename" : "src/test/java/datadog/smoke/TestSucceed.java", "bitmap" : "ABg=" 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 b8b60ad8f0e4..ab751733a1cc 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 @@ -11,36 +11,121 @@ "duration" : ${content_duration}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 1, "test.code_coverage.lines_pct" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : ":test", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "gradle", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.10", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "classes", + "resource" : "classes", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileJava", + "resource" : "compileJava", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "compileTestJava", + "resource" : "compileTestJava", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -53,38 +138,39 @@ "service" : "test-gradle-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceed", - "start" : ${content_start_2}, - "duration" : ${content_duration_2}, + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.module" : ":test", "test.status" : "pass", + "test_session.name" : "gradle test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -92,27 +178,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_succeed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "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, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", @@ -120,22 +206,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -143,27 +230,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-gradle-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 17, "test.source.start" : 14 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_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", @@ -171,24 +258,25 @@ "test.status" : "skip", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_to_skip_with_itr", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "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", "test.skipped_by_itr" : "true", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -199,44 +287,129 @@ "service" : "test-gradle-service", "name" : "gradle.test_session", "resource" : "gradle-instrumentation-test-project", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "test.itr.tests_skipping.count" : 1, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_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}, "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.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", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", "test.command" : "gradle test", "test.framework_version" : "4.10", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processResources", + "resource" : "processResources", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "processTestResources", + "resource" : "processTestResources", + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_8}, + "parent_id" : ${content_parent_id}, + "service" : "test-gradle-service", + "name" : "testClasses", + "resource" : "testClasses", + "start" : ${content_start_11}, + "duration" : ${content_duration_11}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/coverages.ftl b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/coverages.ftl index 2564a09f96e3..3fae48404fe5 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/coverages.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/coverages.ftl @@ -1,7 +1,7 @@ [ { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id}, + "span_id" : ${content_span_id_6}, "files" : [ { "filename" : "src/main/java/datadog/smoke/Calculator.java", "bitmap" : "IA==" @@ -12,7 +12,7 @@ }, { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id_2}, + "span_id" : ${content_span_id_7}, "files" : [ { "filename" : "src/main/java/datadog/smoke/Calculator.java", "bitmap" : "IA==" @@ -23,7 +23,7 @@ }, { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id_3}, + "span_id" : ${content_span_id_8}, "files" : [ { "filename" : "src/main/java/datadog/smoke/Calculator.java", "bitmap" : "IA==" @@ -34,7 +34,7 @@ }, { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id_4}, + "span_id" : ${content_span_id_9}, "files" : [ { "filename" : "src/main/java/datadog/smoke/Calculator.java", "bitmap" : "IA==" @@ -45,7 +45,7 @@ }, { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id_5}, + "span_id" : ${content_span_id_10}, "files" : [ { "filename" : "src/main/java/datadog/smoke/Calculator.java", "bitmap" : "IA==" 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 7ea3c1316e50..c96978ff73cd 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 @@ -10,38 +10,39 @@ "duration" : ${content_duration}, "error" : 1, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "test.code_coverage.lines_pct" : 33 + "test.code_coverage.lines_pct" : 33, + "_dd.trace_span_attribute_schema" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "fail", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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", - "test_session.name" : "mvn -B test", "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "maven", "test.code_coverage.enabled" : "true", "error.type" : "org.apache.maven.lifecycle.LifecycleExecutionException", "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 test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -57,27 +58,22 @@ "duration" : ${content_duration_2}, "error" : 1, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 33 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "fail", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_module_end", - "runtime.version" : ${content_meta_runtime_version}, - "test.type" : "test", "test_session.name" : "mvn -B test", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "maven", "error.type" : "org.apache.maven.lifecycle.LifecycleExecutionException", "test.code_coverage.enabled" : "true", + "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_2}, @@ -85,7 +81,168 @@ "test.framework_version" : "4.13.2", "test.framework" : "junit4", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_jacoco_maven_plugin_default", + "resource" : "Maven_Smoke_Tests_Project_jacoco_maven_plugin_default", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "execution" : "default", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "jacoco-maven-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "execution" : "default-compile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "execution" : "default-testCompile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "execution" : "default-resources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "execution" : "default-testResources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -98,38 +255,39 @@ "service" : "test-maven-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestFailed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "test.type" : "test", "_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", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestFailed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -137,27 +295,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestFailed.test_failed", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, "error" : 1, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", @@ -165,24 +323,25 @@ "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_failed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestFailed", - "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", "error.type" : "java.lang.AssertionError", "error.stack" : ${content_meta_error_stack_3}, "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -190,27 +349,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestFailed.test_failed", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, "error" : 1, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", @@ -218,25 +377,26 @@ "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_failed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestFailed", - "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", "component" : "junit", "error.type" : "java.lang.AssertionError", "error.stack" : ${content_meta_error_stack_4}, "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -244,27 +404,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_3}, - "span_id" : ${content_span_id_3}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_8}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestFailed.test_failed", - "start" : ${content_start_6}, - "duration" : ${content_duration_6}, + "start" : ${content_start_11}, + "duration" : ${content_duration_11}, "error" : 1, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_6}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_11}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", @@ -272,25 +432,26 @@ "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_failed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestFailed", - "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", "component" : "junit", "error.type" : "java.lang.AssertionError", "error.stack" : ${content_meta_error_stack_5}, "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -298,27 +459,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_4}, - "span_id" : ${content_span_id_4}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_9}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestFailed.test_failed", - "start" : ${content_start_7}, - "duration" : ${content_duration_7}, + "start" : ${content_start_12}, + "duration" : ${content_duration_12}, "error" : 1, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_7}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_12}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", @@ -326,25 +487,26 @@ "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_failed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestFailed", - "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", "component" : "junit", "error.type" : "java.lang.AssertionError", "error.stack" : ${content_meta_error_stack_6}, "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -352,27 +514,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_5}, - "span_id" : ${content_span_id_5}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_10}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestFailed.test_failed", - "start" : ${content_start_8}, - "duration" : ${content_duration_8}, + "start" : ${content_start_13}, + "duration" : ${content_duration_13}, "error" : 1, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_8}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_13}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", "test.source.method" : "test_failed()V", @@ -380,25 +542,26 @@ "test.status" : "fail", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_failed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestFailed", - "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", "component" : "junit", "error.type" : "java.lang.AssertionError", "error.stack" : ${content_meta_error_stack_7}, "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/coverages.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/coverages.ftl index e396263abc0d..baa35c8af2df 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/coverages.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/coverages.ftl @@ -1,7 +1,7 @@ [ { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id}, + "span_id" : ${content_span_id_6}, "files" : [ { "filename" : "src/test/java/datadog/smoke/TestSucceed.java", "bitmap" : "gBg=" 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 41804685f151..2787c9b8c33b 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 @@ -14,36 +14,37 @@ "test.itr.tests_skipping.count" : 1, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 67 }, "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}, "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.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.enabled" : "true", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", "test.command" : "mvn -B test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -59,37 +60,193 @@ "duration" : ${content_duration_2}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 1, "test.code_coverage.lines_pct" : 67 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "maven", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.execution" : "maven-surefire-plugin:test:default-test", "test.itr.tests_skipping.type" : "test", "test.command" : "mvn -B test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.13.2", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_jacoco_maven_plugin_default", + "resource" : "Maven_Smoke_Tests_Project_jacoco_maven_plugin_default", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "execution" : "default", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "jacoco-maven-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "execution" : "default-compile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "execution" : "default-testCompile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "execution" : "default-resources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "execution" : "default-testResources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -102,38 +259,39 @@ "service" : "test-maven-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "test.type" : "test", "_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", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -141,26 +299,26 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_succeed", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", @@ -168,22 +326,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -191,26 +350,26 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 17 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_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", @@ -218,24 +377,25 @@ "test.status" : "skip", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_to_skip_with_itr", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "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", "test.skipped_by_itr" : "true", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/coverages.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/coverages.ftl index 6d41f7aa75f4..5a1c6eaaa13f 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/coverages.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/coverages.ftl @@ -1,7 +1,7 @@ [ { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id}, + "span_id" : ${content_span_id_5}, "files" : [ { "filename" : "src/test/java/datadog/smoke/TestSucceed.java" }, { 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 c53a01e2eb7a..cba132485c22 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 @@ -10,6 +10,7 @@ "duration" : ${content_duration}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 1, "_dd.profiling.enabled" : 0, @@ -17,31 +18,31 @@ }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "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" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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", - "test_session.name" : "mvn -B test", "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "maven", "test.code_coverage.enabled" : "true", "test.toolchain" : ${content_meta_test_toolchain}, + "span.kind" : "test_session_end", "test.itr.tests_skipping.type" : "test", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "mvn -B test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -57,35 +58,160 @@ "duration" : ${content_duration_2}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 1 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_module_end", - "runtime.version" : ${content_meta_runtime_version}, - "test.itr.tests_skipping.enabled" : "true", - "test.type" : "test", "test_session.name" : "mvn -B test", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "maven", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "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.itr.tests_skipping.enabled" : "true", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "execution" : "default-compile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "execution" : "default-testCompile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "execution" : "default-resources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "execution" : "default-testResources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -98,38 +224,39 @@ "service" : "test-maven-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "test.type" : "test", "_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", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -137,27 +264,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_succeed", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", @@ -165,22 +292,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -188,27 +316,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 17, "test.source.start" : 14 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_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", @@ -216,24 +344,25 @@ "test.status" : "skip", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_to_skip_with_itr", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "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", "test.skipped_by_itr" : "true", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file 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 b4d47f4f50ee..4f6a94060b53 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 @@ -10,34 +10,35 @@ "duration" : ${content_duration}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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", - "test_session.name" : "mvn -B test", "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "maven", "test.code_coverage.enabled" : "true", "test.toolchain" : ${content_meta_test_toolchain}, + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "mvn -B test", "test.framework_version" : "2.4.0-M2-groovy-4.0", - "test.framework" : "spock" + "test.framework" : "spock", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -52,31 +53,219 @@ "start" : ${content_start_2}, "duration" : ${content_duration_2}, "error" : 0, - "metrics" : { }, + "metrics" : { + "_dd.host.vcpu_count" : 10 + }, "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", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "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" : "2.4.0-M2-groovy-4.0", "test.framework" : "spock", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_gmavenplus_plugin_default", + "resource" : "Maven_Smoke_Tests_Project_gmavenplus_plugin_default", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "execution" : "default", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "gmavenplus-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_gmavenplus_plugin_default", + "resource" : "Maven_Smoke_Tests_Project_gmavenplus_plugin_default", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "execution" : "default", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "gmavenplus-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "execution" : "default-compile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "execution" : "default-testCompile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "execution" : "default-resources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "execution" : "default-testResources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -89,37 +278,38 @@ "service" : "test-maven-service", "name" : "junit.test_suite", "resource" : "test_successful_maven_run_junit_platform_runner.src.test.groovy.SampleSpockTest", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "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}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "test_successful_maven_run_junit_platform_runner.src.test.groovy.SampleSpockTest", - "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", "test.framework_version" : "2.4.0-M2-groovy-4.0", - "test.framework" : "spock" + "test.framework" : "spock", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -127,47 +317,48 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "test_successful_maven_run_junit_platform_runner.src.test.groovy.SampleSpockTest.test should pass", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "test.type" : "test", "_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", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "test.name" : "test should pass", "span.kind" : "test", "test.suite" : "test_successful_maven_run_junit_platform_runner.src.test.groovy.SampleSpockTest", - "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", "test.framework_version" : "2.4.0-M2-groovy-4.0", - "test.framework" : "spock" + "test.framework" : "spock", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/coverages.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/coverages.ftl index e396263abc0d..baa35c8af2df 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/coverages.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/coverages.ftl @@ -1,7 +1,7 @@ [ { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id}, + "span_id" : ${content_span_id_6}, "files" : [ { "filename" : "src/test/java/datadog/smoke/TestSucceed.java", "bitmap" : "gBg=" 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 ecf435df0c5f..85d5ff14cf62 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 @@ -14,36 +14,37 @@ "test.itr.tests_skipping.count" : 1, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 67 }, "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}, "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.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.enabled" : "true", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", "test.command" : "mvn -B test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -59,37 +60,193 @@ "duration" : ${content_duration_2}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 1, "test.code_coverage.lines_pct" : 67 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "maven", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.execution" : "maven-surefire-plugin:test:default-test", "test.itr.tests_skipping.type" : "test", "test.command" : "mvn -B test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.13.2", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_jacoco_maven_plugin_default", + "resource" : "Maven_Smoke_Tests_Project_jacoco_maven_plugin_default", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "execution" : "default", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "jacoco-maven-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "execution" : "default-compile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "execution" : "default-testCompile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "execution" : "default-resources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "execution" : "default-testResources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -102,38 +259,39 @@ "service" : "test-maven-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "test.type" : "test", "_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", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -141,27 +299,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_succeed", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", @@ -169,22 +327,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -192,27 +351,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 17, "test.source.start" : 14 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_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", @@ -220,24 +379,25 @@ "test.status" : "skip", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_to_skip_with_itr", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "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", "test.skipped_by_itr" : "true", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/coverages.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/coverages.ftl index e396263abc0d..baa35c8af2df 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/coverages.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/coverages.ftl @@ -1,7 +1,7 @@ [ { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id}, + "span_id" : ${content_span_id_6}, "files" : [ { "filename" : "src/test/java/datadog/smoke/TestSucceed.java", "bitmap" : "gBg=" 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 ecf435df0c5f..85d5ff14cf62 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 @@ -14,36 +14,37 @@ "test.itr.tests_skipping.count" : 1, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 67 }, "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}, "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.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.enabled" : "true", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", "test.command" : "mvn -B test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -59,37 +60,193 @@ "duration" : ${content_duration_2}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 1, "test.code_coverage.lines_pct" : 67 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "maven", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.execution" : "maven-surefire-plugin:test:default-test", "test.itr.tests_skipping.type" : "test", "test.command" : "mvn -B test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.13.2", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_jacoco_maven_plugin_default", + "resource" : "Maven_Smoke_Tests_Project_jacoco_maven_plugin_default", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "execution" : "default", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "jacoco-maven-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "execution" : "default-compile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "execution" : "default-testCompile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "execution" : "default-resources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "execution" : "default-testResources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -102,38 +259,39 @@ "service" : "test-maven-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "test.type" : "test", "_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", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -141,27 +299,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_succeed", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", @@ -169,22 +327,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -192,27 +351,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 17, "test.source.start" : 14 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_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", @@ -220,24 +379,25 @@ "test.status" : "skip", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_to_skip_with_itr", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "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", "test.skipped_by_itr" : "true", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/coverages.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/coverages.ftl index 7313480cedb5..128baf2808c7 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/coverages.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/coverages.ftl @@ -1,7 +1,7 @@ [ { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id}, + "span_id" : ${content_span_id_5}, "files" : [ { "filename" : "src/test/java/datadog/smoke/TestSucceedPropertyAssertion.java" } ] 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 3d4c6bb68d23..4fadc2c11261 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 @@ -10,34 +10,35 @@ "duration" : ${content_duration}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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", - "test_session.name" : "mvn -B test", "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "maven", "test.code_coverage.enabled" : "true", "test.toolchain" : ${content_meta_test_toolchain}, + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, "test.command" : "mvn -B test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -52,31 +53,157 @@ "start" : ${content_start_2}, "duration" : ${content_duration_2}, "error" : 0, - "metrics" : { }, + "metrics" : { + "_dd.host.vcpu_count" : 10 + }, "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", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, "library_version" : ${content_meta_library_version}, "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" : "4.13.2", "test.framework" : "junit4", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "execution" : "default-compile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "execution" : "default-testCompile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "execution" : "default-resources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "execution" : "default-testResources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -89,38 +216,39 @@ "service" : "test-maven-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceedPropertyAssertion", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "test.type" : "test", "_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", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceedPropertyAssertion", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -128,27 +256,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceedPropertyAssertion.test_succeed", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceedPropertyAssertion.java", "test.source.method" : "test_succeed()V", @@ -156,22 +284,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceedPropertyAssertion", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ 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 19ccda8882f6..bba32dd098e7 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 @@ -22,7 +22,13 @@ "step.name" : "I add {int} and {int}", "env" : "integration-test", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -37,35 +43,36 @@ "duration" : ${content_duration_2}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "test.code_coverage.lines_pct" : 0 + "test.code_coverage.lines_pct" : 0, + "_dd.trace_span_attribute_schema" : 0 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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_2}, - "test.type" : "test", - "test_session.name" : "mvn -B test", "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "maven", "test.code_coverage.enabled" : "true", "test.toolchain" : ${content_meta_test_toolchain}, + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id_2}, "test.command" : "mvn -B test", "test.framework_version" : "5.4.0", - "test.framework" : "cucumber" + "test.framework" : "cucumber", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -81,50 +88,206 @@ "duration" : ${content_duration_3}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 0 }, "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}, "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", "runtime-id" : ${content_meta_runtime_id_2}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { "type" : "span", "version" : 1, "content" : { - "trace_id" : ${content_trace_id}, + "trace_id" : ${content_test_session_id}, "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "parent_id" : ${content_parent_id_2}, "service" : "test-maven-service", - "name" : "cucumber.step", - "resource" : "a calculator I just turned on", + "name" : "Maven_Smoke_Tests_Project_jacoco_maven_plugin_default", + "resource" : "Maven_Smoke_Tests_Project_jacoco_maven_plugin_default", "start" : ${content_start_4}, "duration" : ${content_duration_4}, "error" : 0, "metrics" : { }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "execution" : "default", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "jacoco-maven-plugin", + "runtime-id" : ${content_meta_runtime_id_2}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "execution" : "default-compile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id_2}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "execution" : "default-testCompile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id_2}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "execution" : "default-resources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id_2}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id_2}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "execution" : "default-testResources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id_2}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "cucumber.step", + "resource" : "a calculator I just turned on", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "library_version" : ${content_meta_library_version}, "component" : "cucumber", "step.name" : "a calculator I just turned on", @@ -132,7 +295,13 @@ "step.location" : "datadog.smoke.calculator.CalculatorSteps.a_calculator_I_just_turned_on()", "step.type" : "io.cucumber.java.JavaStepDefinition", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -145,37 +314,38 @@ "service" : "test-maven-service", "name" : "junit.test_suite", "resource" : "classpath:datadog/smoke/basic_arithmetic.feature:Basic Arithmetic", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "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}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "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}, - "test.type" : "test", - "test_session.name" : "mvn -B test", - "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "component" : "junit", "test.framework_version" : "5.4.0", - "test.framework" : "cucumber" + "test.framework" : "cucumber", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -184,45 +354,46 @@ "content" : { "trace_id" : ${content_trace_id}, "span_id" : ${content_parent_id}, - "parent_id" : ${content_parent_id_2}, + "parent_id" : ${content_parent_id_3}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "classpath:datadog/smoke/basic_arithmetic.feature:Basic Arithmetic.Addition", - "start" : ${content_start_6}, - "duration" : ${content_duration_6}, + "start" : ${content_start_11}, + "duration" : ${content_duration_11}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_6}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_11}, + "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "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}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "test.name" : "Addition", "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}, - "test.type" : "test", - "test_session.name" : "mvn -B test", - "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, - "component" : "junit", "test.framework_version" : "5.4.0", - "test.framework" : "cucumber" + "test.framework" : "cucumber", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -230,17 +401,17 @@ "version" : 1, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id_3}, + "span_id" : ${content_span_id_8}, "parent_id" : ${content_parent_id}, "service" : "test-maven-service", "name" : "cucumber.step", "resource" : "the result is {int}", - "start" : ${content_start_7}, - "duration" : ${content_duration_7}, + "start" : ${content_start_12}, + "duration" : ${content_duration_12}, "error" : 0, "metrics" : { }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "_dd.p.tid" : ${content_meta__dd_p_tid_12}, "library_version" : ${content_meta_library_version}, "component" : "cucumber", "step.location" : "datadog.smoke.calculator.CalculatorSteps.the_result_is(double)", @@ -249,7 +420,13 @@ "step.name" : "the result is {int}", "env" : "integration-test", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/coverages.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/coverages.ftl index e396263abc0d..baa35c8af2df 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/coverages.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/coverages.ftl @@ -1,7 +1,7 @@ [ { "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id}, - "span_id" : ${content_span_id}, + "span_id" : ${content_span_id_6}, "files" : [ { "filename" : "src/test/java/datadog/smoke/TestSucceed.java", "bitmap" : "gBg=" 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 ecf435df0c5f..0d285934bae8 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 @@ -14,36 +14,37 @@ "test.itr.tests_skipping.count" : 1, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.code_coverage.lines_pct" : 67 }, "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}, "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.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.enabled" : "true", "test.toolchain" : ${content_meta_test_toolchain}, "test.itr.tests_skipping.type" : "test", "test.command" : "mvn -B test", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -59,37 +60,193 @@ "duration" : ${content_duration_2}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "test.itr.tests_skipping.count" : 1, "test.code_coverage.lines_pct" : 67 }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "os.architecture" : ${content_meta_os_architecture}, + "test.type" : "test", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.status" : "pass", "_dd.ci.itr.tests_skipped" : "true", - "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "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_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", + "ci.workspace_path" : ${content_meta_ci_workspace_path}, "env" : "integration-test", - "runtime.vendor" : ${content_meta_runtime_vendor}, + "library_version" : ${content_meta_library_version}, "component" : "maven", "test.code_coverage.enabled" : "true", + "span.kind" : "test_module_end", "test.execution" : "maven-surefire-plugin:test:default-test", "test.itr.tests_skipping.type" : "test", "test.command" : "mvn -B test", + "test.code_coverage.backfilled" : "true", "test.framework_version" : "4.13.2", "test.framework" : "junit4", + "test.itr.tests_skipping.enabled" : "true", "runtime-id" : ${content_meta_runtime_id}, - "language" : "jvm" + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_jacoco_maven_plugin_default_prepare_agent", + "resource" : "Maven_Smoke_Tests_Project_jacoco_maven_plugin_default_prepare_agent", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "execution" : "default-prepare-agent", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "jacoco-maven-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_compile", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "execution" : "default-compile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "resource" : "Maven_Smoke_Tests_Project_maven_compiler_plugin_default_testCompile", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "execution" : "default-testCompile", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-compiler-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_resources", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "execution" : "default-resources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_parent_id}, + "service" : "test-maven-service", + "name" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "resource" : "Maven_Smoke_Tests_Project_maven_resources_plugin_default_testResources", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "execution" : "default-testResources", + "project" : "Maven Smoke Tests Project", + "library_version" : ${content_meta_library_version}, + "env" : "integration-test", + "plugin" : "maven-resources-plugin", + "runtime-id" : ${content_meta_runtime_id}, + "language" : "jvm", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -102,38 +259,39 @@ "service" : "test-maven-service", "name" : "junit.test_suite", "resource" : "datadog.smoke.TestSucceed", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, "error" : 0, "metrics" : { + "_dd.host.vcpu_count" : 10, "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_8}, + "test.type" : "test", "_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", + "test_session.name" : "mvn -B test", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "language" : "jvm", - "runtime.name" : ${content_meta_runtime_name}, - "os.platform" : ${content_meta_os_platform}, - "os.version" : ${content_meta_os_version}, + "env" : "integration-test", "library_version" : ${content_meta_library_version}, + "component" : "junit", "span.kind" : "test_suite_end", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -141,27 +299,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_succeed", - "start" : ${content_start_4}, - "duration" : ${content_duration_4}, + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 12, "test.source.start" : 9 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java", "test.source.method" : "test_succeed()V", @@ -169,22 +327,23 @@ "test.status" : "pass", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_succeed", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "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", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } }, { @@ -192,27 +351,27 @@ "version" : 2, "content" : { "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, + "span_id" : ${content_span_id_7}, + "parent_id" : ${content_parent_id_2}, "test_session_id" : ${content_test_session_id}, "test_module_id" : ${content_test_module_id}, "test_suite_id" : ${content_test_suite_id}, "service" : "test-maven-service", "name" : "junit.test", "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", - "start" : ${content_start_5}, - "duration" : ${content_duration_5}, + "start" : ${content_start_10}, + "duration" : ${content_duration_10}, "error" : 0, "metrics" : { "process_id" : ${content_metrics_process_id_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : 10, "test.source.end" : 17, "test.source.start" : 14 }, "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_5}, - "os.architecture" : ${content_meta_os_architecture}, + "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_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", @@ -220,24 +379,25 @@ "test.status" : "skip", "ci.workspace_path" : ${content_meta_ci_workspace_path}, "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" : "test_to_skip_with_itr", "span.kind" : "test", "test.suite" : "datadog.smoke.TestSucceed", - "runtime.version" : ${content_meta_runtime_version}, "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", "test.skipped_by_itr" : "true", "test.framework_version" : "4.13.2", - "test.framework" : "junit4" + "test.framework" : "junit4", + "runtime.name" : ${content_meta_runtime_name}, + "runtime.vendor" : ${content_meta_runtime_vendor}, + "runtime.version" : ${content_meta_runtime_version}, + "os.architecture" : ${content_meta_os_architecture}, + "os.platform" : ${content_meta_os_platform}, + "os.version" : ${content_meta_os_version} } } } ] \ No newline at end of file diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/BuildEventsHandler.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/BuildEventsHandler.java index 14fb209e2524..b77ea19fad65 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/events/BuildEventsHandler.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/events/BuildEventsHandler.java @@ -23,6 +23,12 @@ void onTestSessionStart( void onTestSessionFinish(SessionKey sessionKey); + void onBuildTaskStart(SessionKey sessionKey, String taskName, Map additionalTags); + + void onBuildTaskFail(SessionKey sessionKey, String taskName, Throwable throwable); + + void onBuildTaskFinish(SessionKey sessionKey, String taskName); + BuildModuleSettings onTestModuleStart( SessionKey sessionKey, String moduleName,