diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2 index 3b4049c724a..71689f897c2 100644 --- a/.circleci/config.continue.yml.j2 +++ b/.circleci/config.continue.yml.j2 @@ -782,6 +782,7 @@ jobs: name: Gather muzzle tasks command: >- SKIP_BUILDSCAN="true" + GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'" ./gradlew writeMuzzleTasksToFile << pipeline.parameters.gradle_flags >> --max-workers=3 @@ -1217,6 +1218,20 @@ build_test_jobs: &build_test_jobs parallelism: 4 maxWorkers: 4 testJvm: "8" + + - tests: + requires: + - ok_to_test + name: z_test_8_flaky_debugger + gradleTarget: ":debuggerTest" + gradleParameters: "-PrunFlakyTests" + continueOnFailure: true + triggeredBy: *debugger_modules + stage: debugger + cacheType: base + parallelism: 4 + maxWorkers: 4 + testJvm: "8" {% endif %} - tests: @@ -1420,6 +1435,7 @@ build_test_jobs: &build_test_jobs {% for jdk in all_jdks %} - "test_{{ jdk }}" {% endfor %} + - muzzle - profiling - debugger - system-tests diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b46c81caaf0..7382e7aee27 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -216,7 +216,7 @@ package-oci: onboarding_tests_installer: parallel: matrix: - - ONBOARDING_FILTER_WEBLOG: [test-app-java, test-app-java-container, test-app-java-container-jdk15, test-app-java-alpine-libgcc] + - ONBOARDING_FILTER_WEBLOG: [test-app-java, test-app-java-container, test-app-java-container-jdk15, test-app-java-alpine] SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ] - ONBOARDING_FILTER_WEBLOG: [test-app-java-buildpack] SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION ] diff --git a/communication/src/main/java/datadog/communication/BackendApiFactory.java b/communication/src/main/java/datadog/communication/BackendApiFactory.java index f60eaa7e215..bebb7b42828 100644 --- a/communication/src/main/java/datadog/communication/BackendApiFactory.java +++ b/communication/src/main/java/datadog/communication/BackendApiFactory.java @@ -3,11 +3,13 @@ import datadog.communication.ddagent.DDAgentFeaturesDiscovery; import datadog.communication.ddagent.SharedCommunicationObjects; import datadog.communication.http.HttpRetryPolicy; +import datadog.communication.http.OkHttpUtils; import datadog.trace.api.Config; import datadog.trace.util.throwable.FatalAgentMisconfigurationError; import java.util.function.Function; import javax.annotation.Nullable; import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,13 +36,10 @@ public BackendApiFactory(Config config, SharedCommunicationObjects sharedCommuni "Agentless mode is enabled and api key is not set. Please set application key"); } String traceId = config.getIdGenerationStrategy().generateTraceId().toString(); - return new IntakeApi( - agentlessUrl, - apiKey, - traceId, - retryPolicyFactory, - sharedCommunicationObjects.okHttpClient, - true); + OkHttpClient httpClient = + OkHttpUtils.buildHttpClient( + agentlessUrl, config.getCiVisibilityBackendApiTimeoutMillis()); + return new IntakeApi(agentlessUrl, apiKey, traceId, retryPolicyFactory, httpClient, true); } DDAgentFeaturesDiscovery featuresDiscovery = diff --git a/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java b/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java index 14de312dadc..8c02098fe81 100644 --- a/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java +++ b/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java @@ -36,21 +36,11 @@ public void createRemaining(Config config) { } } if (okHttpClient == null) { - String unixDomainSocket; - String namedPipe; - HttpUrl url; - if (!config.isCiVisibilityAgentlessEnabled()) { - unixDomainSocket = SocketUtils.discoverApmSocket(config); - namedPipe = config.getAgentNamedPipe(); - url = agentUrl; - } else { - unixDomainSocket = null; - namedPipe = null; - url = null; - } + String unixDomainSocket = SocketUtils.discoverApmSocket(config); + String namedPipe = config.getAgentNamedPipe(); okHttpClient = OkHttpUtils.buildHttpClient( - url, unixDomainSocket, namedPipe, getHttpClientTimeout(config)); + agentUrl, unixDomainSocket, namedPipe, getHttpClientTimeout(config)); } } diff --git a/dd-java-agent/agent-ci-visibility/build.gradle b/dd-java-agent/agent-ci-visibility/build.gradle index ce29f741f0e..7f15e8abefb 100644 --- a/dd-java-agent/agent-ci-visibility/build.gradle +++ b/dd-java-agent/agent-ci-visibility/build.gradle @@ -25,8 +25,8 @@ dependencies { api libs.slf4j implementation libs.bundles.asm - implementation group: 'org.jacoco', name: 'org.jacoco.core', version: '0.8.9' - implementation group: 'org.jacoco', name: 'org.jacoco.report', version: '0.8.9' + implementation group: 'org.jacoco', name: 'org.jacoco.core', version: '0.8.12' + implementation group: 'org.jacoco', name: 'org.jacoco.report', version: '0.8.12' implementation project(':communication') implementation project(':internal-api') 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 0e6d0839fe5..9766b25998d 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 5712831cf2a..41c3bc3c759 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 638fa326b4f..705002bedbb 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 00000000000..648a98a1f12 --- /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 88054ba77a7..00000000000 --- 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/avro/src/main/java/datadog/trace/instrumentation/avro/SchemaExtractor.java b/dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/SchemaExtractor.java index 115e9296fb7..0338d90ff85 100644 --- a/dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/SchemaExtractor.java +++ b/dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/SchemaExtractor.java @@ -32,7 +32,10 @@ public static boolean extractProperty( switch (field.schema().getType()) { case RECORD: - type = "object"; + type = "#/components/schemas/" + field.schema().getFullName(); + if (!extractSchema(field.schema(), builder, depth)) { + return false; + } break; case ENUM: type = "string"; @@ -41,10 +44,26 @@ public static boolean extractProperty( case ARRAY: array = true; type = getType(field.schema().getElementType().getType().getName()); + if (type == "record") { + type = "#/components/schemas/" + field.schema().getElementType().getFullName(); + if (!extractSchema(field.schema().getElementType(), builder, depth)) { + return false; + } + ; + } break; case MAP: type = "object"; - description = "Map type"; + String keys = "string"; + String values = getType(field.schema().getValueType().getType().getName()); + if (values == "record") { + values = "#/components/schemas/" + field.schema().getValueType().getFullName(); + if (!extractSchema(field.schema().getValueType(), builder, depth)) { + return false; + } + ; + } + description = "Map type with " + keys + " keys and " + values + " values"; break; case STRING: type = "string"; @@ -164,6 +183,8 @@ private static String getType(String type) { return "boolean"; case "null": return "null"; + case "record": + return "record"; default: return "string"; } diff --git a/dd-java-agent/instrumentation/avro/src/test/groovy/AvroDatumReaderTest.groovy b/dd-java-agent/instrumentation/avro/src/test/groovy/AvroDatumReaderTest.groovy index e777ab6a1a8..f9c67f418ed 100644 --- a/dd-java-agent/instrumentation/avro/src/test/groovy/AvroDatumReaderTest.groovy +++ b/dd-java-agent/instrumentation/avro/src/test/groovy/AvroDatumReaderTest.groovy @@ -23,8 +23,8 @@ class AvroDatumReaderTest extends AgentTestRunner { return true } - String schemaID = "5493435211744749109" - String openApiSchemaDef = "{\"components\":{\"schemas\":{\"TestRecord\":{\"properties\":{\"stringField\":{\"type\":\"string\"},\"intField\":{\"format\":\"int32\",\"type\":\"integer\"},\"longField\":{\"format\":\"int64\",\"type\":\"integer\"},\"floatField\":{\"format\":\"float\",\"type\":\"number\"},\"doubleField\":{\"format\":\"double\",\"type\":\"number\"},\"booleanField\":{\"type\":\"boolean\"},\"bytesField\":{\"format\":\"byte\",\"type\":\"string\"},\"nullField\":{\"type\":\"null\"},\"enumField\":{\"enum\":[\"A\",\"B\",\"C\"],\"type\":\"string\"},\"fixedField\":{\"type\":\"string\"},\"recordField\":{\"type\":\"object\"},\"arrayField\":{\"items\":{\"type\":\"integer\"},\"type\":\"array\"},\"mapField\":{\"description\":\"Map type\",\"type\":\"object\"}},\"type\":\"object\"}}},\"openapi\":\"3.0.0\"}" + String schemaID = "8924443781494069161" + String openApiSchemaDef = "{\"components\":{\"schemas\":{\"TestRecord\":{\"properties\":{\"stringField\":{\"type\":\"string\"},\"intField\":{\"format\":\"int32\",\"type\":\"integer\"},\"longField\":{\"format\":\"int64\",\"type\":\"integer\"},\"floatField\":{\"format\":\"float\",\"type\":\"number\"},\"doubleField\":{\"format\":\"double\",\"type\":\"number\"},\"booleanField\":{\"type\":\"boolean\"},\"bytesField\":{\"format\":\"byte\",\"type\":\"string\"},\"nullField\":{\"type\":\"null\"},\"enumField\":{\"enum\":[\"A\",\"B\",\"C\"],\"type\":\"string\"},\"fixedField\":{\"type\":\"string\"},\"recordField\":{\"type\":\"#/components/schemas/NestedRecord\"},\"arrayField\":{\"items\":{\"type\":\"integer\"},\"type\":\"array\"},\"mapField\":{\"description\":\"Map type with string keys and string values\",\"type\":\"object\"},\"arrayNestedField\":{\"items\":{\"type\":\"#/components/schemas/OtherNestedRecord\"},\"type\":\"array\"},\"mapNestedField\":{\"description\":\"Map type with string keys and #/components/schemas/ThirdTypeOfNestedRecord values\",\"type\":\"object\"}},\"type\":\"object\"},\"NestedRecord\":{\"properties\":{\"nestedString\":{\"type\":\"string\"}},\"type\":\"object\"},\"OtherNestedRecord\":{\"properties\":{\"nestedString\":{\"type\":\"string\"}},\"type\":\"object\"},\"ThirdTypeOfNestedRecord\":{\"properties\":{\"nestedString\":{\"type\":\"string\"}},\"type\":\"object\"}}},\"openapi\":\"3.0.0\"}" String schemaStr = ''' { "type": "record", @@ -42,14 +42,14 @@ class AvroDatumReaderTest extends AgentTestRunner { {"name": "fixedField", "type": {"type": "fixed", "name": "TestFixed", "size": 16}}, {"name": "recordField", "type": {"type": "record", "name": "NestedRecord", "fields": [{"name": "nestedString", "type": "string"}]}}, {"name": "arrayField", "type": {"type": "array", "items": "int"}}, - {"name": "mapField", "type": {"type": "map", "values": "string"}} + {"name": "mapField", "type": {"type": "map", "values": "string"}}, + {"name": "arrayNestedField", "type": { "type": "array", "items": {"type": "record", "name": "OtherNestedRecord", "fields": [{"name": "nestedString", "type": "string"}]}}}, + {"name": "mapNestedField", "type": {"type": "map", "values": {"type": "record", "name": "ThirdTypeOfNestedRecord", "fields": [{"name": "nestedString", "type": "string"}]}}} ] } ''' Schema schemaDef = new Schema.Parser().parse(schemaStr) - - void 'test extract avro schema on deserialize'() { setup: @@ -80,6 +80,20 @@ class AvroDatumReaderTest extends AgentTestRunner { map.put("key2", "value2") datum.put("mapField", map) + // array of nested fields + GenericRecord nestedRecordA = new GenericData.Record(schemaDef.getField("arrayNestedField").schema().getElementType()) + nestedRecordA.put("nestedString", "a") + GenericRecord nestedRecordB = new GenericData.Record(schemaDef.getField("arrayNestedField").schema().getElementType()) + nestedRecordB.put("nestedString", "b") + datum.put("arrayNestedField", Arrays.asList(nestedRecordA, nestedRecordB)) + + // map of nested fields + Map nestedMap = new HashMap<>() + GenericRecord nestedRecordC = new GenericData.Record(schemaDef.getField("mapNestedField").schema().getValueType()) + nestedRecordC.put("nestedString", "a") + nestedMap.put("key1", nestedRecordC) + datum.put("mapNestedField", nestedMap) + when: def bytes ByteArrayOutputStream out = new ByteArrayOutputStream() @@ -153,6 +167,20 @@ class AvroDatumReaderTest extends AgentTestRunner { map.put("key2", "value2") datum.put("mapField", map) + // array of nested fields + GenericRecord nestedRecordA = new GenericData.Record(schemaDef.getField("arrayNestedField").schema().getElementType()) + nestedRecordA.put("nestedString", "a") + GenericRecord nestedRecordB = new GenericData.Record(schemaDef.getField("arrayNestedField").schema().getElementType()) + nestedRecordB.put("nestedString", "b") + datum.put("arrayNestedField", Arrays.asList(nestedRecordA, nestedRecordB)) + + // map of nested fields + Map nestedMap = new HashMap<>() + GenericRecord nestedRecordC = new GenericData.Record(schemaDef.getField("mapNestedField").schema().getValueType()) + nestedRecordC.put("nestedString", "a") + nestedMap.put("key1", nestedRecordC) + datum.put("mapNestedField", nestedMap) + when: def bytes ByteArrayOutputStream out = new ByteArrayOutputStream() 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 95e5b55ebd7..f92a31b345b 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 aaa2989aff6..8e1987d3190 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 b13422bd563..ff5fe6dd52c 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 f76215fc7fa..acbc5b6fbb0 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 7640fe08ebf..d87b24768fc 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2} + }, "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 5de81acc87e..8acd652b687 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" : ${content_metrics__dd_host_vcpu_count}, "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 180c9143df1..7b64e5006c6 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2} + }, "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 d0eeff6f50e..94cf248cd1b 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" : ${content_metrics__dd_host_vcpu_count}, "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 180c9143df1..7b64e5006c6 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2} + }, "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 1c5f0d81577..46a7419d59f 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2} + }, "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" : ${content_metrics__dd_host_vcpu_count_3} + }, "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 c6342d89e37..32e7011868c 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2} + }, "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" : ${content_metrics__dd_host_vcpu_count_3} + }, "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 499be5055d6..703c8420758 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2} + }, "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" : ${content_metrics__dd_host_vcpu_count_3} + }, "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-java-agent/instrumentation/protobuf/build.gradle b/dd-java-agent/instrumentation/protobuf/build.gradle index f2241646305..9634a602868 100644 --- a/dd-java-agent/instrumentation/protobuf/build.gradle +++ b/dd-java-agent/instrumentation/protobuf/build.gradle @@ -1,15 +1,43 @@ +plugins { + id "com.google.protobuf" version "0.9.4" +} + +apply from: "$rootDir/gradle/java.gradle" + muzzle { pass { group = "com.google.protobuf" module = "protobuf-java" - versions = "[,)" + versions = "[2.0.0,)" + skipVersions = ["2.0.1", "2.1.0", "2.2.0", "2.3.0", "2.4.1"] assertInverse = true } } -apply from: "$rootDir/gradle/java.gradle" +protobuf { + protoc { + def os = System.getProperty("os.name").toLowerCase() + def arch = System.getProperty("os.arch").toLowerCase() + + // There is no m1 support for protoc 3.0.0, so require Rosetta + if (os.contains("mac") && arch.contains("aarch64")) { + artifact = "com.google.protobuf:protoc:3.0.0:osx-x86_64" + } else { + artifact = "com.google.protobuf:protoc:3.0.0" + } + } +} + dependencies { compileOnly group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' testImplementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' } + +sourceSets { + test { + java { + srcDir "$buildDir/generated/source/proto/test/java" + } + } +} diff --git a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractMessageInstrumentation.java b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractMessageInstrumentation.java index 57c7209dd4d..8d6f6083dd6 100644 --- a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractMessageInstrumentation.java +++ b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractMessageInstrumentation.java @@ -10,6 +10,7 @@ import com.google.protobuf.AbstractMessage; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.ExecutionException; import net.bytebuddy.asm.Advice; @@ -58,11 +59,19 @@ public void methodAdvice(MethodTransformer transformer) { public static class WriteToAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static void onEnter(@Advice.This AbstractMessage message) { + final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(AbstractMessage.class); + if (callDepth > 0) { + return; + } SchemaExtractor.attachSchemaOnSpan(message, activeSpan(), SchemaExtractor.serialization); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan(@Advice.Thrown final Throwable throwable) { + final int callDepth = CallDepthThreadLocalMap.decrementCallDepth(AbstractMessage.class); + if (callDepth > 0) { + return; + } AgentSpan span = activeSpan(); if (throwable != null) { span.addThrowable( diff --git a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractParserInstrumentation.java b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractParserInstrumentation.java index 92e4e4b70a0..d9e90df2a5f 100644 --- a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractParserInstrumentation.java +++ b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/AbstractParserInstrumentation.java @@ -9,9 +9,11 @@ import com.google.auto.service.AutoService; import com.google.protobuf.AbstractMessage; +import com.google.protobuf.AbstractParser; import com.google.protobuf.MessageLite; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.ExecutionException; import net.bytebuddy.asm.Advice; @@ -55,9 +57,19 @@ public void methodAdvice(MethodTransformer transformer) { } public static class ParseFromAdvice { + + @Advice.OnMethodEnter(suppress = Throwable.class) + public static void trackDepth() { + CallDepthThreadLocalMap.incrementCallDepth(AbstractParser.class); + } + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( @Advice.Thrown final Throwable throwable, @Advice.Return MessageLite message) { + final int callDepth = CallDepthThreadLocalMap.decrementCallDepth(AbstractParser.class); + if (callDepth > 0) { + return; + } AgentSpan span = activeSpan(); if (span == null) { return; diff --git a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/DynamicMessageInstrumentation.java b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/DynamicMessageInstrumentation.java index d71e0ef0181..fccaf12734e 100644 --- a/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/DynamicMessageInstrumentation.java +++ b/dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/DynamicMessageInstrumentation.java @@ -9,8 +9,10 @@ import com.google.auto.service.AutoService; import com.google.protobuf.Descriptors.Descriptor; +import com.google.protobuf.DynamicMessage; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.bootstrap.CallDepthThreadLocalMap; import net.bytebuddy.asm.Advice; @AutoService(InstrumenterModule.class) @@ -50,7 +52,16 @@ public void methodAdvice(MethodTransformer transformer) { public static class ParseFromAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static void onEnter(@Advice.Argument(0) final Descriptor descriptor) { + final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(DynamicMessage.class); + if (callDepth > 0) { + return; + } SchemaExtractor.attachSchemaOnSpan(descriptor, activeSpan(), SchemaExtractor.deserialization); } + + @Advice.OnMethodExit() + public static void trackDepth() { + CallDepthThreadLocalMap.decrementCallDepth(DynamicMessage.class); + } } } diff --git a/dd-java-agent/instrumentation/protobuf/src/test/groovy/Message.java b/dd-java-agent/instrumentation/protobuf/src/test/groovy/Message.java deleted file mode 100644 index 2f4b44b96ff..00000000000 --- a/dd-java-agent/instrumentation/protobuf/src/test/groovy/Message.java +++ /dev/null @@ -1,963 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: message.proto - -public final class Message { - private Message() {} - - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {} - - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry); - } - - public interface MyMessageOrBuilder - extends - // @@protoc_insertion_point(interface_extends:MyMessage) - com.google.protobuf.MessageOrBuilder { - - /** optional string id = 1; */ - java.lang.String getId(); - /** optional string id = 1; */ - com.google.protobuf.ByteString getIdBytes(); - - /** optional string value = 2; */ - java.lang.String getValue(); - /** optional string value = 2; */ - com.google.protobuf.ByteString getValueBytes(); - - /** repeated .OtherMessage other_message = 3; */ - java.util.List getOtherMessageList(); - /** repeated .OtherMessage other_message = 3; */ - OtherMessageOuterClass.OtherMessage getOtherMessage(int index); - /** repeated .OtherMessage other_message = 3; */ - int getOtherMessageCount(); - /** repeated .OtherMessage other_message = 3; */ - java.util.List - getOtherMessageOrBuilderList(); - /** repeated .OtherMessage other_message = 3; */ - OtherMessageOuterClass.OtherMessageOrBuilder getOtherMessageOrBuilder(int index); - } - /** Protobuf type {@code MyMessage} */ - public static final class MyMessage extends com.google.protobuf.GeneratedMessageV3 - implements - // @@protoc_insertion_point(message_implements:MyMessage) - MyMessageOrBuilder { - // Use MyMessage.newBuilder() to construct. - private MyMessage(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } - - private MyMessage() { - id_ = ""; - value_ = ""; - otherMessage_ = java.util.Collections.emptyList(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } - - private MyMessage( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - int mutable_bitField0_ = 0; - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: - { - if (!input.skipField(tag)) { - done = true; - } - break; - } - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - id_ = s; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - value_ = s; - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - otherMessage_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - otherMessage_.add( - input.readMessage( - OtherMessageOuterClass.OtherMessage.parser(), extensionRegistry)); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - otherMessage_ = java.util.Collections.unmodifiableList(otherMessage_); - } - makeExtensionsImmutable(); - } - } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return Message.internal_static_MyMessage_descriptor; - } - - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return Message.internal_static_MyMessage_fieldAccessorTable.ensureFieldAccessorsInitialized( - Message.MyMessage.class, Message.MyMessage.Builder.class); - } - - private int bitField0_; - public static final int ID_FIELD_NUMBER = 1; - private volatile java.lang.Object id_; - /** optional string id = 1; */ - public java.lang.String getId() { - java.lang.Object ref = id_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - id_ = s; - return s; - } - } - /** optional string id = 1; */ - public com.google.protobuf.ByteString getIdBytes() { - java.lang.Object ref = id_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); - id_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - public static final int VALUE_FIELD_NUMBER = 2; - private volatile java.lang.Object value_; - /** optional string value = 2; */ - public java.lang.String getValue() { - java.lang.Object ref = value_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - value_ = s; - return s; - } - } - /** optional string value = 2; */ - public com.google.protobuf.ByteString getValueBytes() { - java.lang.Object ref = value_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); - value_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - public static final int OTHER_MESSAGE_FIELD_NUMBER = 3; - private java.util.List otherMessage_; - /** repeated .OtherMessage other_message = 3; */ - public java.util.List getOtherMessageList() { - return otherMessage_; - } - /** repeated .OtherMessage other_message = 3; */ - public java.util.List - getOtherMessageOrBuilderList() { - return otherMessage_; - } - /** repeated .OtherMessage other_message = 3; */ - public int getOtherMessageCount() { - return otherMessage_.size(); - } - /** repeated .OtherMessage other_message = 3; */ - public OtherMessageOuterClass.OtherMessage getOtherMessage(int index) { - return otherMessage_.get(index); - } - /** repeated .OtherMessage other_message = 3; */ - public OtherMessageOuterClass.OtherMessageOrBuilder getOtherMessageOrBuilder(int index) { - return otherMessage_.get(index); - } - - private byte memoizedIsInitialized = -1; - - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getIdBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_); - } - if (!getValueBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, value_); - } - for (int i = 0; i < otherMessage_.size(); i++) { - output.writeMessage(3, otherMessage_.get(i)); - } - } - - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; - - size = 0; - if (!getIdBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_); - } - if (!getValueBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, value_); - } - for (int i = 0; i < otherMessage_.size(); i++) { - size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, otherMessage_.get(i)); - } - memoizedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof Message.MyMessage)) { - return super.equals(obj); - } - Message.MyMessage other = (Message.MyMessage) obj; - - boolean result = true; - result = result && getId().equals(other.getId()); - result = result && getValue().equals(other.getValue()); - result = result && getOtherMessageList().equals(other.getOtherMessageList()); - return result; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); - hash = (37 * hash) + ID_FIELD_NUMBER; - hash = (53 * hash) + getId().hashCode(); - hash = (37 * hash) + VALUE_FIELD_NUMBER; - hash = (53 * hash) + getValue().hashCode(); - if (getOtherMessageCount() > 0) { - hash = (37 * hash) + OTHER_MESSAGE_FIELD_NUMBER; - hash = (53 * hash) + getOtherMessageList().hashCode(); - } - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static Message.MyMessage parseFrom(com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static Message.MyMessage parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static Message.MyMessage parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static Message.MyMessage parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static Message.MyMessage parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); - } - - public static Message.MyMessage parseFrom( - java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException( - PARSER, input, extensionRegistry); - } - - public static Message.MyMessage parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); - } - - public static Message.MyMessage parseDelimitedFrom( - java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( - PARSER, input, extensionRegistry); - } - - public static Message.MyMessage parseFrom(com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); - } - - public static Message.MyMessage parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException( - PARSER, input, extensionRegistry); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - - public static Builder newBuilder(Message.MyMessage prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - - public Builder toBuilder() { - return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** Protobuf type {@code MyMessage} */ - public static final class Builder - extends com.google.protobuf.GeneratedMessageV3.Builder - implements - // @@protoc_insertion_point(builder_implements:MyMessage) - Message.MyMessageOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return Message.internal_static_MyMessage_descriptor; - } - - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return Message.internal_static_MyMessage_fieldAccessorTable.ensureFieldAccessorsInitialized( - Message.MyMessage.class, Message.MyMessage.Builder.class); - } - - // Construct using Message.MyMessage.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getOtherMessageFieldBuilder(); - } - } - - public Builder clear() { - super.clear(); - id_ = ""; - - value_ = ""; - - if (otherMessageBuilder_ == null) { - otherMessage_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); - } else { - otherMessageBuilder_.clear(); - } - return this; - } - - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return Message.internal_static_MyMessage_descriptor; - } - - public Message.MyMessage getDefaultInstanceForType() { - return Message.MyMessage.getDefaultInstance(); - } - - public Message.MyMessage build() { - Message.MyMessage result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public Message.MyMessage buildPartial() { - Message.MyMessage result = new Message.MyMessage(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - result.id_ = id_; - result.value_ = value_; - if (otherMessageBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { - otherMessage_ = java.util.Collections.unmodifiableList(otherMessage_); - bitField0_ = (bitField0_ & ~0x00000004); - } - result.otherMessage_ = otherMessage_; - } else { - result.otherMessage_ = otherMessageBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder clone() { - return (Builder) super.clone(); - } - - public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) { - return (Builder) super.setField(field, value); - } - - public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); - } - - public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); - } - - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) { - return (Builder) super.setRepeatedField(field, index, value); - } - - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, Object value) { - return (Builder) super.addRepeatedField(field, value); - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof Message.MyMessage) { - return mergeFrom((Message.MyMessage) other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(Message.MyMessage other) { - if (other == Message.MyMessage.getDefaultInstance()) return this; - if (!other.getId().isEmpty()) { - id_ = other.id_; - onChanged(); - } - if (!other.getValue().isEmpty()) { - value_ = other.value_; - onChanged(); - } - if (otherMessageBuilder_ == null) { - if (!other.otherMessage_.isEmpty()) { - if (otherMessage_.isEmpty()) { - otherMessage_ = other.otherMessage_; - bitField0_ = (bitField0_ & ~0x00000004); - } else { - ensureOtherMessageIsMutable(); - otherMessage_.addAll(other.otherMessage_); - } - onChanged(); - } - } else { - if (!other.otherMessage_.isEmpty()) { - if (otherMessageBuilder_.isEmpty()) { - otherMessageBuilder_.dispose(); - otherMessageBuilder_ = null; - otherMessage_ = other.otherMessage_; - bitField0_ = (bitField0_ & ~0x00000004); - otherMessageBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders - ? getOtherMessageFieldBuilder() - : null; - } else { - otherMessageBuilder_.addAllMessages(other.otherMessage_); - } - } - } - onChanged(); - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - Message.MyMessage parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (Message.MyMessage) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - private int bitField0_; - - private java.lang.Object id_ = ""; - /** optional string id = 1; */ - public java.lang.String getId() { - java.lang.Object ref = id_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - id_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** optional string id = 1; */ - public com.google.protobuf.ByteString getIdBytes() { - java.lang.Object ref = id_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); - id_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** optional string id = 1; */ - public Builder setId(java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - id_ = value; - onChanged(); - return this; - } - /** optional string id = 1; */ - public Builder clearId() { - - id_ = getDefaultInstance().getId(); - onChanged(); - return this; - } - /** optional string id = 1; */ - public Builder setIdBytes(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - id_ = value; - onChanged(); - return this; - } - - private java.lang.Object value_ = ""; - /** optional string value = 2; */ - public java.lang.String getValue() { - java.lang.Object ref = value_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - value_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** optional string value = 2; */ - public com.google.protobuf.ByteString getValueBytes() { - java.lang.Object ref = value_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); - value_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** optional string value = 2; */ - public Builder setValue(java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - value_ = value; - onChanged(); - return this; - } - /** optional string value = 2; */ - public Builder clearValue() { - - value_ = getDefaultInstance().getValue(); - onChanged(); - return this; - } - /** optional string value = 2; */ - public Builder setValueBytes(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - value_ = value; - onChanged(); - return this; - } - - private java.util.List otherMessage_ = - java.util.Collections.emptyList(); - - private void ensureOtherMessageIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { - otherMessage_ = - new java.util.ArrayList(otherMessage_); - bitField0_ |= 0x00000004; - } - } - - private com.google.protobuf.RepeatedFieldBuilderV3< - OtherMessageOuterClass.OtherMessage, - OtherMessageOuterClass.OtherMessage.Builder, - OtherMessageOuterClass.OtherMessageOrBuilder> - otherMessageBuilder_; - - /** repeated .OtherMessage other_message = 3; */ - public java.util.List getOtherMessageList() { - if (otherMessageBuilder_ == null) { - return java.util.Collections.unmodifiableList(otherMessage_); - } else { - return otherMessageBuilder_.getMessageList(); - } - } - /** repeated .OtherMessage other_message = 3; */ - public int getOtherMessageCount() { - if (otherMessageBuilder_ == null) { - return otherMessage_.size(); - } else { - return otherMessageBuilder_.getCount(); - } - } - /** repeated .OtherMessage other_message = 3; */ - public OtherMessageOuterClass.OtherMessage getOtherMessage(int index) { - if (otherMessageBuilder_ == null) { - return otherMessage_.get(index); - } else { - return otherMessageBuilder_.getMessage(index); - } - } - /** repeated .OtherMessage other_message = 3; */ - public Builder setOtherMessage(int index, OtherMessageOuterClass.OtherMessage value) { - if (otherMessageBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureOtherMessageIsMutable(); - otherMessage_.set(index, value); - onChanged(); - } else { - otherMessageBuilder_.setMessage(index, value); - } - return this; - } - /** repeated .OtherMessage other_message = 3; */ - public Builder setOtherMessage( - int index, OtherMessageOuterClass.OtherMessage.Builder builderForValue) { - if (otherMessageBuilder_ == null) { - ensureOtherMessageIsMutable(); - otherMessage_.set(index, builderForValue.build()); - onChanged(); - } else { - otherMessageBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** repeated .OtherMessage other_message = 3; */ - public Builder addOtherMessage(OtherMessageOuterClass.OtherMessage value) { - if (otherMessageBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureOtherMessageIsMutable(); - otherMessage_.add(value); - onChanged(); - } else { - otherMessageBuilder_.addMessage(value); - } - return this; - } - /** repeated .OtherMessage other_message = 3; */ - public Builder addOtherMessage(int index, OtherMessageOuterClass.OtherMessage value) { - if (otherMessageBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureOtherMessageIsMutable(); - otherMessage_.add(index, value); - onChanged(); - } else { - otherMessageBuilder_.addMessage(index, value); - } - return this; - } - /** repeated .OtherMessage other_message = 3; */ - public Builder addOtherMessage(OtherMessageOuterClass.OtherMessage.Builder builderForValue) { - if (otherMessageBuilder_ == null) { - ensureOtherMessageIsMutable(); - otherMessage_.add(builderForValue.build()); - onChanged(); - } else { - otherMessageBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** repeated .OtherMessage other_message = 3; */ - public Builder addOtherMessage( - int index, OtherMessageOuterClass.OtherMessage.Builder builderForValue) { - if (otherMessageBuilder_ == null) { - ensureOtherMessageIsMutable(); - otherMessage_.add(index, builderForValue.build()); - onChanged(); - } else { - otherMessageBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** repeated .OtherMessage other_message = 3; */ - public Builder addAllOtherMessage( - java.lang.Iterable values) { - if (otherMessageBuilder_ == null) { - ensureOtherMessageIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll(values, otherMessage_); - onChanged(); - } else { - otherMessageBuilder_.addAllMessages(values); - } - return this; - } - /** repeated .OtherMessage other_message = 3; */ - public Builder clearOtherMessage() { - if (otherMessageBuilder_ == null) { - otherMessage_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); - onChanged(); - } else { - otherMessageBuilder_.clear(); - } - return this; - } - /** repeated .OtherMessage other_message = 3; */ - public Builder removeOtherMessage(int index) { - if (otherMessageBuilder_ == null) { - ensureOtherMessageIsMutable(); - otherMessage_.remove(index); - onChanged(); - } else { - otherMessageBuilder_.remove(index); - } - return this; - } - /** repeated .OtherMessage other_message = 3; */ - public OtherMessageOuterClass.OtherMessage.Builder getOtherMessageBuilder(int index) { - return getOtherMessageFieldBuilder().getBuilder(index); - } - /** repeated .OtherMessage other_message = 3; */ - public OtherMessageOuterClass.OtherMessageOrBuilder getOtherMessageOrBuilder(int index) { - if (otherMessageBuilder_ == null) { - return otherMessage_.get(index); - } else { - return otherMessageBuilder_.getMessageOrBuilder(index); - } - } - /** repeated .OtherMessage other_message = 3; */ - public java.util.List - getOtherMessageOrBuilderList() { - if (otherMessageBuilder_ != null) { - return otherMessageBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(otherMessage_); - } - } - /** repeated .OtherMessage other_message = 3; */ - public OtherMessageOuterClass.OtherMessage.Builder addOtherMessageBuilder() { - return getOtherMessageFieldBuilder() - .addBuilder(OtherMessageOuterClass.OtherMessage.getDefaultInstance()); - } - /** repeated .OtherMessage other_message = 3; */ - public OtherMessageOuterClass.OtherMessage.Builder addOtherMessageBuilder(int index) { - return getOtherMessageFieldBuilder() - .addBuilder(index, OtherMessageOuterClass.OtherMessage.getDefaultInstance()); - } - /** repeated .OtherMessage other_message = 3; */ - public java.util.List - getOtherMessageBuilderList() { - return getOtherMessageFieldBuilder().getBuilderList(); - } - - private com.google.protobuf.RepeatedFieldBuilderV3< - OtherMessageOuterClass.OtherMessage, - OtherMessageOuterClass.OtherMessage.Builder, - OtherMessageOuterClass.OtherMessageOrBuilder> - getOtherMessageFieldBuilder() { - if (otherMessageBuilder_ == null) { - otherMessageBuilder_ = - new com.google.protobuf.RepeatedFieldBuilderV3< - OtherMessageOuterClass.OtherMessage, - OtherMessageOuterClass.OtherMessage.Builder, - OtherMessageOuterClass.OtherMessageOrBuilder>( - otherMessage_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); - otherMessage_ = null; - } - return otherMessageBuilder_; - } - - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; - } - - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; - } - - // @@protoc_insertion_point(builder_scope:MyMessage) - } - - // @@protoc_insertion_point(class_scope:MyMessage) - private static final Message.MyMessage DEFAULT_INSTANCE; - - static { - DEFAULT_INSTANCE = new Message.MyMessage(); - } - - public static Message.MyMessage getDefaultInstance() { - return DEFAULT_INSTANCE; - } - - private static final com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public MyMessage parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new MyMessage(input, extensionRegistry); - } - }; - - public static com.google.protobuf.Parser parser() { - return PARSER; - } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - public Message.MyMessage getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - } - - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_MyMessage_descriptor; - private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_MyMessage_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { - return descriptor; - } - - private static com.google.protobuf.Descriptors.FileDescriptor descriptor; - - static { - java.lang.String[] descriptorData = { - "\n\rmessage.proto\032\023other_message.proto\"L\n\t" - + "MyMessage\022\n\n\002id\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022$\n\r" - + "other_message\030\003 \003(\0132\r.OtherMessageb\006prot" - + "o3" - }; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( - descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - OtherMessageOuterClass.getDescriptor(), - }, - assigner); - internal_static_MyMessage_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_MyMessage_fieldAccessorTable = - new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_MyMessage_descriptor, - new java.lang.String[] { - "Id", "Value", "OtherMessage", - }); - OtherMessageOuterClass.getDescriptor(); - } - - // @@protoc_insertion_point(outer_class_scope) -} diff --git a/dd-java-agent/instrumentation/protobuf/src/test/groovy/OtherMessageOuterClass.java b/dd-java-agent/instrumentation/protobuf/src/test/groovy/OtherMessageOuterClass.java deleted file mode 100644 index 156049b71a7..00000000000 --- a/dd-java-agent/instrumentation/protobuf/src/test/groovy/OtherMessageOuterClass.java +++ /dev/null @@ -1,622 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: other_message.proto - -public final class OtherMessageOuterClass { - private OtherMessageOuterClass() {} - - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {} - - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry); - } - - public interface OtherMessageOrBuilder - extends - // @@protoc_insertion_point(interface_extends:OtherMessage) - com.google.protobuf.MessageOrBuilder { - - /** repeated string name = 1; */ - java.util.List getNameList(); - /** repeated string name = 1; */ - int getNameCount(); - /** repeated string name = 1; */ - java.lang.String getName(int index); - /** repeated string name = 1; */ - com.google.protobuf.ByteString getNameBytes(int index); - - /** optional int32 age = 2; */ - int getAge(); - } - /** Protobuf type {@code OtherMessage} */ - public static final class OtherMessage extends com.google.protobuf.GeneratedMessageV3 - implements - // @@protoc_insertion_point(message_implements:OtherMessage) - OtherMessageOrBuilder { - // Use OtherMessage.newBuilder() to construct. - private OtherMessage(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } - - private OtherMessage() { - name_ = com.google.protobuf.LazyStringArrayList.EMPTY; - age_ = 0; - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } - - private OtherMessage( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - int mutable_bitField0_ = 0; - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: - { - if (!input.skipField(tag)) { - done = true; - } - break; - } - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - name_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - name_.add(s); - break; - } - case 16: - { - age_ = input.readInt32(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - name_ = name_.getUnmodifiableView(); - } - makeExtensionsImmutable(); - } - } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return OtherMessageOuterClass.internal_static_OtherMessage_descriptor; - } - - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return OtherMessageOuterClass.internal_static_OtherMessage_fieldAccessorTable - .ensureFieldAccessorsInitialized( - OtherMessageOuterClass.OtherMessage.class, - OtherMessageOuterClass.OtherMessage.Builder.class); - } - - private int bitField0_; - public static final int NAME_FIELD_NUMBER = 1; - private com.google.protobuf.LazyStringList name_; - /** repeated string name = 1; */ - public com.google.protobuf.ProtocolStringList getNameList() { - return name_; - } - /** repeated string name = 1; */ - public int getNameCount() { - return name_.size(); - } - /** repeated string name = 1; */ - public java.lang.String getName(int index) { - return name_.get(index); - } - /** repeated string name = 1; */ - public com.google.protobuf.ByteString getNameBytes(int index) { - return name_.getByteString(index); - } - - public static final int AGE_FIELD_NUMBER = 2; - private int age_; - /** optional int32 age = 2; */ - public int getAge() { - return age_; - } - - private byte memoizedIsInitialized = -1; - - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < name_.size(); i++) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_.getRaw(i)); - } - if (age_ != 0) { - output.writeInt32(2, age_); - } - } - - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; - - size = 0; - { - int dataSize = 0; - for (int i = 0; i < name_.size(); i++) { - dataSize += computeStringSizeNoTag(name_.getRaw(i)); - } - size += dataSize; - size += 1 * getNameList().size(); - } - if (age_ != 0) { - size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, age_); - } - memoizedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof OtherMessageOuterClass.OtherMessage)) { - return super.equals(obj); - } - OtherMessageOuterClass.OtherMessage other = (OtherMessageOuterClass.OtherMessage) obj; - - boolean result = true; - result = result && getNameList().equals(other.getNameList()); - result = result && (getAge() == other.getAge()); - return result; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptorForType().hashCode(); - if (getNameCount() > 0) { - hash = (37 * hash) + NAME_FIELD_NUMBER; - hash = (53 * hash) + getNameList().hashCode(); - } - hash = (37 * hash) + AGE_FIELD_NUMBER; - hash = (53 * hash) + getAge(); - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static OtherMessageOuterClass.OtherMessage parseFrom(com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static OtherMessageOuterClass.OtherMessage parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static OtherMessageOuterClass.OtherMessage parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static OtherMessageOuterClass.OtherMessage parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static OtherMessageOuterClass.OtherMessage parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); - } - - public static OtherMessageOuterClass.OtherMessage parseFrom( - java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException( - PARSER, input, extensionRegistry); - } - - public static OtherMessageOuterClass.OtherMessage parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); - } - - public static OtherMessageOuterClass.OtherMessage parseDelimitedFrom( - java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( - PARSER, input, extensionRegistry); - } - - public static OtherMessageOuterClass.OtherMessage parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); - } - - public static OtherMessageOuterClass.OtherMessage parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException( - PARSER, input, extensionRegistry); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - - public static Builder newBuilder(OtherMessageOuterClass.OtherMessage prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - - public Builder toBuilder() { - return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** Protobuf type {@code OtherMessage} */ - public static final class Builder - extends com.google.protobuf.GeneratedMessageV3.Builder - implements - // @@protoc_insertion_point(builder_implements:OtherMessage) - OtherMessageOuterClass.OtherMessageOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return OtherMessageOuterClass.internal_static_OtherMessage_descriptor; - } - - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return OtherMessageOuterClass.internal_static_OtherMessage_fieldAccessorTable - .ensureFieldAccessorsInitialized( - OtherMessageOuterClass.OtherMessage.class, - OtherMessageOuterClass.OtherMessage.Builder.class); - } - - // Construct using OtherMessageOuterClass.OtherMessage.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} - } - - public Builder clear() { - super.clear(); - name_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); - age_ = 0; - - return this; - } - - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return OtherMessageOuterClass.internal_static_OtherMessage_descriptor; - } - - public OtherMessageOuterClass.OtherMessage getDefaultInstanceForType() { - return OtherMessageOuterClass.OtherMessage.getDefaultInstance(); - } - - public OtherMessageOuterClass.OtherMessage build() { - OtherMessageOuterClass.OtherMessage result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public OtherMessageOuterClass.OtherMessage buildPartial() { - OtherMessageOuterClass.OtherMessage result = new OtherMessageOuterClass.OtherMessage(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - name_ = name_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.name_ = name_; - result.age_ = age_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder clone() { - return (Builder) super.clone(); - } - - public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) { - return (Builder) super.setField(field, value); - } - - public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); - } - - public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); - } - - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, int index, Object value) { - return (Builder) super.setRepeatedField(field, index, value); - } - - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, Object value) { - return (Builder) super.addRepeatedField(field, value); - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof OtherMessageOuterClass.OtherMessage) { - return mergeFrom((OtherMessageOuterClass.OtherMessage) other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(OtherMessageOuterClass.OtherMessage other) { - if (other == OtherMessageOuterClass.OtherMessage.getDefaultInstance()) return this; - if (!other.name_.isEmpty()) { - if (name_.isEmpty()) { - name_ = other.name_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureNameIsMutable(); - name_.addAll(other.name_); - } - onChanged(); - } - if (other.getAge() != 0) { - setAge(other.getAge()); - } - onChanged(); - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - OtherMessageOuterClass.OtherMessage parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (OtherMessageOuterClass.OtherMessage) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - private int bitField0_; - - private com.google.protobuf.LazyStringList name_ = - com.google.protobuf.LazyStringArrayList.EMPTY; - - private void ensureNameIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { - name_ = new com.google.protobuf.LazyStringArrayList(name_); - bitField0_ |= 0x00000001; - } - } - /** repeated string name = 1; */ - public com.google.protobuf.ProtocolStringList getNameList() { - return name_.getUnmodifiableView(); - } - /** repeated string name = 1; */ - public int getNameCount() { - return name_.size(); - } - /** repeated string name = 1; */ - public java.lang.String getName(int index) { - return name_.get(index); - } - /** repeated string name = 1; */ - public com.google.protobuf.ByteString getNameBytes(int index) { - return name_.getByteString(index); - } - /** repeated string name = 1; */ - public Builder setName(int index, java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - ensureNameIsMutable(); - name_.set(index, value); - onChanged(); - return this; - } - /** repeated string name = 1; */ - public Builder addName(java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - ensureNameIsMutable(); - name_.add(value); - onChanged(); - return this; - } - /** repeated string name = 1; */ - public Builder addAllName(java.lang.Iterable values) { - ensureNameIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll(values, name_); - onChanged(); - return this; - } - /** repeated string name = 1; */ - public Builder clearName() { - name_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - return this; - } - /** repeated string name = 1; */ - public Builder addNameBytes(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - ensureNameIsMutable(); - name_.add(value); - onChanged(); - return this; - } - - private int age_; - /** optional int32 age = 2; */ - public int getAge() { - return age_; - } - /** optional int32 age = 2; */ - public Builder setAge(int value) { - - age_ = value; - onChanged(); - return this; - } - /** optional int32 age = 2; */ - public Builder clearAge() { - - age_ = 0; - onChanged(); - return this; - } - - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; - } - - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return this; - } - - // @@protoc_insertion_point(builder_scope:OtherMessage) - } - - // @@protoc_insertion_point(class_scope:OtherMessage) - private static final OtherMessageOuterClass.OtherMessage DEFAULT_INSTANCE; - - static { - DEFAULT_INSTANCE = new OtherMessageOuterClass.OtherMessage(); - } - - public static OtherMessageOuterClass.OtherMessage getDefaultInstance() { - return DEFAULT_INSTANCE; - } - - private static final com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public OtherMessage parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new OtherMessage(input, extensionRegistry); - } - }; - - public static com.google.protobuf.Parser parser() { - return PARSER; - } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - public OtherMessageOuterClass.OtherMessage getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - } - - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_OtherMessage_descriptor; - private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_OtherMessage_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { - return descriptor; - } - - private static com.google.protobuf.Descriptors.FileDescriptor descriptor; - - static { - java.lang.String[] descriptorData = { - "\n\023other_message.proto\")\n\014OtherMessage\022\014\n" - + "\004name\030\001 \003(\t\022\013\n\003age\030\002 \001(\005b\006proto3" - }; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( - descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}, assigner); - internal_static_OtherMessage_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_OtherMessage_fieldAccessorTable = - new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_OtherMessage_descriptor, - new java.lang.String[] { - "Name", "Age", - }); - } - - // @@protoc_insertion_point(outer_class_scope) -} diff --git a/dd-java-agent/instrumentation/protobuf/src/test/groovy/AbstractMessageInstrumentationTest.groovy b/dd-java-agent/instrumentation/protobuf/src/test/groovy/com/datadog/instrumentation/protobuf/AbstractMessageInstrumentationTest.groovy similarity index 70% rename from dd-java-agent/instrumentation/protobuf/src/test/groovy/AbstractMessageInstrumentationTest.groovy rename to dd-java-agent/instrumentation/protobuf/src/test/groovy/com/datadog/instrumentation/protobuf/AbstractMessageInstrumentationTest.groovy index 65157cf8eab..0cfb7c1eb9c 100644 --- a/dd-java-agent/instrumentation/protobuf/src/test/groovy/AbstractMessageInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/protobuf/src/test/groovy/com/datadog/instrumentation/protobuf/AbstractMessageInstrumentationTest.groovy @@ -1,3 +1,5 @@ +package com.datadog.instrumentation.protobuf + import com.google.protobuf.InvalidProtocolBufferException import datadog.trace.agent.test.AgentTestRunner import datadog.trace.api.DDTags @@ -5,6 +7,8 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan +import com.datadog.instrumentation.protobuf.generated.Message.MyMessage +import com.datadog.instrumentation.protobuf.generated.Message.OtherMessage class AbstractMessageInstrumentationTest extends AgentTestRunner { @Override @@ -12,14 +16,16 @@ class AbstractMessageInstrumentationTest extends AgentTestRunner { return true } - String schema = "{\"components\":{\"schemas\":{\"MyMessage\":{\"properties\":{\"id\":{\"type\":\"string\"},\"value\":{\"type\":\"string\"},\"other_message\":{\"items\":{\"\$ref\":\"#/components/schemas/OtherMessage\"},\"type\":\"array\"}},\"type\":\"object\"},\"OtherMessage\":{\"properties\":{\"name\":{\"items\":{\"type\":\"string\"},\"type\":\"array\"},\"age\":{\"format\":\"int32\",\"type\":\"integer\"}},\"type\":\"object\"}}},\"openapi\":\"3.0.0\"}" - String schemaID = "17871055810055148870" + String schema = "{\"components\":{\"schemas\":{\"com.datadog.instrumentation.protobuf.generated.MyMessage\":{\"properties\":{\"id\":{\"type\":\"string\"},\"value\":{\"type\":\"string\"},\"other_message\":{\"items\":{\"\$ref\":\"#/components/schemas/com.datadog.instrumentation.protobuf.generated.OtherMessage\"},\"type\":\"array\"}},\"type\":\"object\"},\"com.datadog.instrumentation.protobuf.generated.OtherMessage\":{\"properties\":{\"name\":{\"type\":\"string\"},\"age\":{\"format\":\"int32\",\"type\":\"integer\"}},\"type\":\"object\"}}},\"openapi\":\"3.0.0\"}" + String schemaID = "9054678588020233022" + void 'test extract protobuf schema on serialize & deserialize'() { setup: - Message.MyMessage message = Message.MyMessage.newBuilder() + MyMessage message = MyMessage.newBuilder() .setId("1") .setValue("Hello from Protobuf!") + .setNested(OtherMessage.newBuilder().setName("hello").setAge(10).build()) .build() when: var bytes @@ -31,7 +37,7 @@ class AbstractMessageInstrumentationTest extends AgentTestRunner { runUnderTrace("parent_deserialize") { AgentSpan span = activeSpan() span.setTag(DDTags.MANUAL_KEEP, true) - Message.MyMessage.parseFrom(bytes) + MyMessage.parseFrom(bytes) } TEST_WRITER.waitForTraces(2) then: @@ -47,7 +53,7 @@ class AbstractMessageInstrumentationTest extends AgentTestRunner { "$DDTags.SCHEMA_DEFINITION" schema "$DDTags.SCHEMA_WEIGHT" 1 "$DDTags.SCHEMA_TYPE" "protobuf" - "$DDTags.SCHEMA_NAME" "MyMessage" + "$DDTags.SCHEMA_NAME" "com.datadog.instrumentation.protobuf.generated.MyMessage" "$DDTags.SCHEMA_OPERATION" "serialization" "$DDTags.SCHEMA_ID" schemaID defaultTags(false) @@ -65,7 +71,7 @@ class AbstractMessageInstrumentationTest extends AgentTestRunner { "$DDTags.SCHEMA_DEFINITION" schema "$DDTags.SCHEMA_WEIGHT" 1 "$DDTags.SCHEMA_TYPE" "protobuf" - "$DDTags.SCHEMA_NAME" "MyMessage" + "$DDTags.SCHEMA_NAME" "com.datadog.instrumentation.protobuf.generated.MyMessage" "$DDTags.SCHEMA_OPERATION" "deserialization" "$DDTags.SCHEMA_ID" schemaID defaultTags(false) @@ -77,7 +83,7 @@ class AbstractMessageInstrumentationTest extends AgentTestRunner { void 'test error when de-serializing'() { setup: - Message.MyMessage message = Message.MyMessage.newBuilder() + MyMessage message = MyMessage.newBuilder() .setId("1") .setValue("Hello from Protobuf!") .build() @@ -86,7 +92,7 @@ class AbstractMessageInstrumentationTest extends AgentTestRunner { AgentSpan span = activeSpan() span.setTag(DDTags.MANUAL_KEEP, true) try { - Message.MyMessage.parseFrom(new byte[]{ + MyMessage.parseFrom(new byte[]{ 1, 2, 3, 4, 5 }) } catch (InvalidProtocolBufferException e) { diff --git a/dd-java-agent/instrumentation/protobuf/src/test/groovy/DynamicMessageInstrumentationTest.groovy b/dd-java-agent/instrumentation/protobuf/src/test/groovy/com/datadog/instrumentation/protobuf/DynamicMessageInstrumentationTest.groovy similarity index 66% rename from dd-java-agent/instrumentation/protobuf/src/test/groovy/DynamicMessageInstrumentationTest.groovy rename to dd-java-agent/instrumentation/protobuf/src/test/groovy/com/datadog/instrumentation/protobuf/DynamicMessageInstrumentationTest.groovy index 87c2665d3fe..be49e10a379 100644 --- a/dd-java-agent/instrumentation/protobuf/src/test/groovy/DynamicMessageInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/protobuf/src/test/groovy/com/datadog/instrumentation/protobuf/DynamicMessageInstrumentationTest.groovy @@ -1,7 +1,10 @@ +package com.datadog.instrumentation.protobuf + import com.google.protobuf.DynamicMessage import datadog.trace.agent.test.AgentTestRunner import datadog.trace.api.DDTags import datadog.trace.bootstrap.instrumentation.api.AgentSpan +import com.datadog.instrumentation.protobuf.generated.Message.MyMessage import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan @@ -14,13 +17,13 @@ class DynamicMessageInstrumentationTest extends AgentTestRunner { void 'test extract protobuf schema using the dynamic message'() { setup: - Message.MyMessage message = Message.MyMessage.newBuilder() + MyMessage message = MyMessage.newBuilder() .setId("1") .setValue("Hello from Protobuf!") .build() when: - String schema = "{\"components\":{\"schemas\":{\"MyMessage\":{\"properties\":{\"id\":{\"type\":\"string\"},\"value\":{\"type\":\"string\"},\"other_message\":{\"items\":{\"\$ref\":\"#/components/schemas/OtherMessage\"},\"type\":\"array\"}},\"type\":\"object\"},\"OtherMessage\":{\"properties\":{\"name\":{\"items\":{\"type\":\"string\"},\"type\":\"array\"},\"age\":{\"format\":\"int32\",\"type\":\"integer\"}},\"type\":\"object\"}}},\"openapi\":\"3.0.0\"}" - String schemaID = "17871055810055148870" + String schema = "{\"components\":{\"schemas\":{\"com.datadog.instrumentation.protobuf.generated.MyMessage\":{\"properties\":{\"id\":{\"type\":\"string\"},\"value\":{\"type\":\"string\"},\"other_message\":{\"items\":{\"\$ref\":\"#/components/schemas/com.datadog.instrumentation.protobuf.generated.OtherMessage\"},\"type\":\"array\"}},\"type\":\"object\"},\"com.datadog.instrumentation.protobuf.generated.OtherMessage\":{\"properties\":{\"name\":{\"type\":\"string\"},\"age\":{\"format\":\"int32\",\"type\":\"integer\"}},\"type\":\"object\"}}},\"openapi\":\"3.0.0\"}" + String schemaID = "9054678588020233022" var bytes runUnderTrace("parent_serialize") { AgentSpan span = activeSpan() @@ -30,7 +33,7 @@ class DynamicMessageInstrumentationTest extends AgentTestRunner { runUnderTrace("parent_deserialize") { AgentSpan span = activeSpan() span.setTag(DDTags.MANUAL_KEEP, true) - DynamicMessage.parseFrom(Message.MyMessage.getDescriptor(), bytes) + DynamicMessage.parseFrom(MyMessage.getDescriptor(), bytes) } TEST_WRITER.waitForTraces(2) then: @@ -46,7 +49,7 @@ class DynamicMessageInstrumentationTest extends AgentTestRunner { "$DDTags.SCHEMA_DEFINITION" schema "$DDTags.SCHEMA_WEIGHT" 1 "$DDTags.SCHEMA_TYPE" "protobuf" - "$DDTags.SCHEMA_NAME" "MyMessage" + "$DDTags.SCHEMA_NAME" "com.datadog.instrumentation.protobuf.generated.MyMessage" "$DDTags.SCHEMA_OPERATION" "serialization" "$DDTags.SCHEMA_ID" schemaID defaultTags(false) @@ -64,7 +67,7 @@ class DynamicMessageInstrumentationTest extends AgentTestRunner { "$DDTags.SCHEMA_DEFINITION" schema "$DDTags.SCHEMA_WEIGHT" 1 "$DDTags.SCHEMA_TYPE" "protobuf" - "$DDTags.SCHEMA_NAME" "MyMessage" + "$DDTags.SCHEMA_NAME" "com.datadog.instrumentation.protobuf.generated.MyMessage" "$DDTags.SCHEMA_OPERATION" "deserialization" "$DDTags.SCHEMA_ID" schemaID defaultTags(false) diff --git a/dd-java-agent/instrumentation/protobuf/src/test/groovy/message.proto b/dd-java-agent/instrumentation/protobuf/src/test/groovy/message.proto deleted file mode 100644 index 16f1c289663..00000000000 --- a/dd-java-agent/instrumentation/protobuf/src/test/groovy/message.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -import "other_message.proto"; - -message MyMessage { - string id = 1; - string value = 2; - repeated OtherMessage other_message = 3; -} diff --git a/dd-java-agent/instrumentation/protobuf/src/test/groovy/other_message.proto b/dd-java-agent/instrumentation/protobuf/src/test/groovy/other_message.proto deleted file mode 100644 index 1ef06a940dc..00000000000 --- a/dd-java-agent/instrumentation/protobuf/src/test/groovy/other_message.proto +++ /dev/null @@ -1,6 +0,0 @@ -syntax = "proto3"; - -message OtherMessage { - repeated string name = 1; - int32 age = 2; -} diff --git a/dd-java-agent/instrumentation/protobuf/src/test/proto/message.proto b/dd-java-agent/instrumentation/protobuf/src/test/proto/message.proto new file mode 100644 index 00000000000..d78165d2da7 --- /dev/null +++ b/dd-java-agent/instrumentation/protobuf/src/test/proto/message.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +package com.datadog.instrumentation.protobuf.generated; + +message OtherMessage { + string name = 1; + int32 age = 2; +} + +message MyMessage { + string id = 1; + string value = 2; + repeated OtherMessage other_message = 3; + OtherMessage nested = 4; +} diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java index 35fbe2db466..9d402367efc 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java @@ -507,6 +507,8 @@ protected void assertCaptureArgs( CapturedContext.CapturedValue capturedValue = context.getArguments().get(name); assertEquals(typeName, capturedValue.getType()); Object objValue = capturedValue.getValue(); + assertNotNull( + "objValue null for argName=" + name + " capturedValue=" + capturedValue, objValue); if (objValue.getClass().isArray()) { assertEquals(value, Arrays.toString((Object[]) objValue)); } else { diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java index 24d06b512cd..fb0165a33ca 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java @@ -26,6 +26,7 @@ import datadog.trace.bootstrap.debugger.CapturedContext; import datadog.trace.bootstrap.debugger.MethodLocation; import datadog.trace.bootstrap.debugger.ProbeId; +import datadog.trace.test.util.Flaky; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -53,6 +54,7 @@ void testInaccessibleObject() throws Exception { assertFalse(logHasErrors(logFilePath, it -> false)); } + @Flaky @Test @DisplayName("testFullMethod") void testFullMethod() throws Exception { 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 dfa139a7d4c..bfaf939f115 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" : ${content_metrics__dd_host_vcpu_count}, "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 622326206a1..5c889dfe66b 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" : ${content_metrics__dd_host_vcpu_count}, "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 b48693eb598..50389b1ce1c 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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" : ${content_metrics__dd_host_vcpu_count_6}, "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" : ${content_metrics__dd_host_vcpu_count_7}, "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" : ${content_metrics__dd_host_vcpu_count_8}, "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 3f5f80ff5dc..9a4a429aca3 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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 141c5e5507d..ed2b3951cdf 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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 ec077dce224..9c985de11ac 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" : ${content_metrics__dd_host_vcpu_count} + }, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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 5449faab9e4..954aa5bfef5 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2} + }, "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 b6b94b8bcd4..7fd3cc4c6e5 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 3ec5a1d934e..5a38603277a 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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 b6b94b8bcd4..7fd3cc4c6e5 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 694a37dee94..70db137f084 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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 2a80c0112f7..6108551983d 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 92da3d3a64c..a3ca60a65ac 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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" : ${content_metrics__dd_host_vcpu_count_6}, "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 539be8b8b54..6108551983d 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 f405ecdd402..5aa5805aa37 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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" : ${content_metrics__dd_host_vcpu_count_6}, "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 f56fb1a2304..0d7b25e82a2 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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" : ${content_metrics__dd_host_vcpu_count_6}, "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" : ${content_metrics__dd_host_vcpu_count_7}, "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 c2da21bb360..07f3c12a851 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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" : ${content_metrics__dd_host_vcpu_count_6}, "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" : ${content_metrics__dd_host_vcpu_count_7}, "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 b6b94b8bcd4..7fd3cc4c6e5 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 ca6e00d6f4d..e87a6124aff 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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 640a61a0db8..8a915a940a5 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 b8b60ad8f0e..2ab655f90b9 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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 2564a09f96e..3fae48404fe 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 7ea3c1316e5..de36bce9bb9 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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" : ${content_metrics__dd_host_vcpu_count_6}, "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" : ${content_metrics__dd_host_vcpu_count_7}, "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" : ${content_metrics__dd_host_vcpu_count_8}, "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 e396263abc0..baa35c8af2d 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 41804685f15..a78398337a1 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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 6d41f7aa75f..5a1c6eaaa13 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 c53a01e2eb7..b9087a75f77 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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 b4d47f4f50e..62ef446c3b1 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2} + }, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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 e396263abc0..baa35c8af2d 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 ecf435df0c5..325b5d84af4 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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 e396263abc0..baa35c8af2d 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 ecf435df0c5..325b5d84af4 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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 7313480cedb..128baf2808c 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 3d4c6bb68d2..9acb0896dfc 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2} + }, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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 19ccda8882f..a5cde18b7e5 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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 e396263abc0..baa35c8af2d 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 ecf435df0c5..fdf743960d1 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" : ${content_metrics__dd_host_vcpu_count}, "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" : ${content_metrics__dd_host_vcpu_count_2}, "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" : ${content_metrics__dd_host_vcpu_count_3}, "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" : ${content_metrics__dd_host_vcpu_count_4}, "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" : ${content_metrics__dd_host_vcpu_count_5}, "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-trace-core/src/main/java/datadog/trace/common/writer/WriterFactory.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/WriterFactory.java index ef73a0b6fb7..b4af03b90e7 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/writer/WriterFactory.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/WriterFactory.java @@ -188,7 +188,6 @@ private static RemoteApi createDDIntakeRemoteApi( } return DDIntakeApi.builder() .hostUrl(hostUrl) - .httpClient(commObjects.okHttpClient) .apiKey(config.getApiKey()) .trackType(trackType) .build(); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java index 6cacd7037ff..9dd4d982a36 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java @@ -247,7 +247,9 @@ PropagationTags.Factory getPropagationTagsFactory() { */ @Override public void onRootSpanFinished(AgentSpan root, EndpointTracker tracker) { - profilingContextIntegration.onRootSpanFinished(root, tracker); + if (!root.isOutbound()) { + profilingContextIntegration.onRootSpanFinished(root, tracker); + } } /** @@ -269,7 +271,10 @@ void onRootSpanPublished(final AgentSpan root) { @Override public EndpointTracker onRootSpanStarted(AgentSpan root) { - return profilingContextIntegration.onRootSpanStarted(root); + if (!root.isOutbound()) { + return profilingContextIntegration.onRootSpanStarted(root); + } + return null; } @Override @@ -1296,7 +1301,9 @@ private DDSpan buildSpan() { DDSpan span = DDSpan.create(instrumentationName, timestampMicro, buildSpanContext(), links); if (span.isLocalRootSpan()) { EndpointTracker tracker = tracer.onRootSpanStarted(span); - span.setEndpointTracker(tracker); + if (tracker != null) { + span.setEndpointTracker(tracker); + } } return span; } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java index 909363a8188..180889600d3 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java @@ -28,6 +28,7 @@ import datadog.trace.bootstrap.instrumentation.api.AttachableWrapper; import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities; import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities; +import datadog.trace.bootstrap.instrumentation.api.Tags; import java.io.PrintWriter; import java.io.StringWriter; import java.util.Collections; @@ -855,4 +856,10 @@ public DDSpan setMetaStruct(final String field, final Object value) { context.setMetaStruct(field, value); return this; } + + @Override + public boolean isOutbound() { + Object spanKind = context.getTag(Tags.SPAN_KIND); + return Tags.SPAN_KIND_CLIENT.equals(spanKind) || Tags.SPAN_KIND_PRODUCER.equals(spanKind); + } } 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 14fb209e252..b77ea19fad6 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, diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java index 73431389ae1..91bf717e7d4 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java @@ -150,6 +150,8 @@ default ScopedContext storeInto(ScopedContext context) { AgentSpan setMetaStruct(final String field, final Object value); + boolean isOutbound(); + interface Context { /** * Gets the TraceId of the span's trace. diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java index c5ea96a35d4..256aab3d970 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java @@ -856,6 +856,11 @@ public AgentSpan setMetaStruct(String field, Object value) { return this; } + @Override + public boolean isOutbound() { + return false; + } + @Override public boolean isRequiresPostProcessing() { return false; diff --git a/internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/ConfigProviderTest.groovy b/internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/ConfigProviderTest.groovy index dc94247490b..b9783ec59c1 100644 --- a/internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/ConfigProviderTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/ConfigProviderTest.groovy @@ -22,4 +22,27 @@ class ConfigProviderTest extends DDSpecification { config["/a"] == "prop" config["/b"] == "env" } + + + def "test config alias priority"() { + setup: + injectEnvConfig("CONFIG_NAME", configNameValue) + injectEnvConfig("CONFIG_ALIAS1", configAlias1Value) + injectEnvConfig("CONFIG_ALIAS2", configAlias2Value) + + when: + def config = configProvider.getString("CONFIG_NAME", null, "CONFIG_ALIAS1", "CONFIG_ALIAS2") + + then: + config == expected + + where: + configNameValue | configAlias1Value | configAlias2Value | expected + "default" | null | null | "default" + null | "alias1" | null | "alias1" + null | null | "alias2" | "alias2" + "default" | "alias1" | null | "default" + "default" | null | "alias2" | "default" + null | "alias1" | "alias2" | "alias1" + } }